diff options
| author | Linus Nordberg <linus@nordberg.se> | 2014-09-22 10:22:10 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordberg.se> | 2014-09-22 10:22:10 +0200 |
| commit | 01e20019fa481190a0ac90622d95f214bb7ca755 (patch) | |
| tree | 5cf904c36657520cc90c5d9f41eefcc51b149f8e /ebin | |
| parent | 813cddd87ffa18ffdc3ff6df54377bb0590fc445 (diff) | |
| parent | 90af53429cce94dee753441b780a9cf050f5fced (diff) | |
Merge branch 'map/releasemanagement' into master-origin
Conflicts:
ebin/catlfish.app
Diffstat (limited to 'ebin')
| -rw-r--r-- | ebin/catlfish.app | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ebin/catlfish.app b/ebin/catlfish.app index 4dbb166..5e3b7ee 100644 --- a/ebin/catlfish.app +++ b/ebin/catlfish.app @@ -7,7 +7,6 @@ {application, catlfish, [{description, "catlfish -- Certificate Transparency Log Server"}, {vsn, "0.1.1"}, - {modules, [v1]}, - {applications, [kernel, stdlib, plop, inets]}]}. -%% {registered, [catlfish]}]}. -%% {mod, {catlfish, ["test/eckey.pem", "test/eckey-public.pem"]}}]}. + {modules, [v1, catlfish_app]}, + {applications, [kernel, stdlib, plop, inets, jiffy]}, + {mod, {catlfish_app, []}}]}. |