diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-11-15 10:01:30 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-11-15 10:01:30 +0300 |
| commit | b04c6b7d7513025006847a4da1bdca34dc35f87f (patch) | |
| tree | 35a43055ac10a4ddb2757d846deb18d022699b8a /rebar.config | |
| parent | mod_stream_mgmt: Improve logging on timeout (diff) | |
| parent | Explain what is needed for the acme configuration and other small changes (diff) | |
Merge branch 'lets_encrypt_acme_support' of git://github.com/angelhof/ejabberd into angelhof-lets_encrypt_acme_support
Conflicts:
rebar.config
src/ejabberd_pkix.erl
Diffstat (limited to 'rebar.config')
| -rw-r--r-- | rebar.config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/rebar.config b/rebar.config index 323605f2a..359225843 100644 --- a/rebar.config +++ b/rebar.config @@ -30,6 +30,7 @@ {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}}, {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.2"}}}, {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "v0.2"}}}, + {jose, ".*", {git, "git://github.com/potatosalad/erlang-jose.git", {tag, "1.8.4"}}}, {fs, ".*", {git, "https://github.com/synrc/fs.git", {tag, "2.12.0"}}}, {if_var_true, stun, {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.15"}}}}, {if_var_true, sip, {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.16"}}}}, |