diff options
| author | Linus Nordberg <linus@nordberg.se> | 2014-10-29 15:59:10 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordberg.se> | 2014-10-29 15:59:10 +0100 |
| commit | d79c260758e7544dd46de2adfad85d1c0bee859b (patch) | |
| tree | b580925a77d14eaf1722b410bd0dabd795191a2e /ebin | |
| parent | 5a10cf6fa6fff3cbca3340a7c75120603bda18ca (diff) | |
| parent | 87e02103ea3f47b825b415c415f7d2940d009b42 (diff) | |
Merge remote-tracking branch 'refs/remotes/map/external-merge3' into merging-external-merge
Conflicts:
src/v1.erl
tools/merge.py
tools/testcase1.py
Diffstat (limited to 'ebin')
| -rw-r--r-- | ebin/catlfish.app | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ebin/catlfish.app b/ebin/catlfish.app index beea7d6..75bc876 100644 --- a/ebin/catlfish.app +++ b/ebin/catlfish.app @@ -8,5 +8,5 @@ [{description, "catlfish -- Certificate Transparency Log Server"}, {vsn, "0.2.0-dev"}, {modules, [v1, catlfish_app]}, - {applications, [kernel, stdlib, plop, inets, jiffy, lager, mochiweb]}, + {applications, [kernel, stdlib, plop, inets, lager, mochiweb]}, {mod, {catlfish_app, []}}]}. |