diff options
| author | iNPUTmice <daniel@gultsch.de> | 2015-02-23 13:10:33 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2015-02-23 13:10:33 +0100 |
| commit | 37e9db32998f640cad53523af07395de960cdc2f (patch) | |
| tree | 15a8a065af55f4d5a09b63a142d4a8d0e33dc754 | |
| parent | 7a62fbbeae99e3ee3b5a2516e8f08e3a2c37c718 (diff) | |
| parent | b8e21e57ee8f8c450d35d2a592a71020e12d051c (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
| -rw-r--r-- | build.gradle | 5 | ||||
| -rw-r--r-- | docs/XEPs.md | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/build.gradle b/build.gradle index 0a7a4648..e19924af 100644 --- a/build.gradle +++ b/build.gradle @@ -20,9 +20,6 @@ allprojects { apply plugin: 'com.android.application' repositories { - maven { - url "http://jitsi.github.com/otr4j/repository/" - } jcenter() mavenCentral() } @@ -32,7 +29,7 @@ dependencies { compile project(':libs:MemorizingTrustManager') compile 'com.android.support:support-v13:21.0.3' compile 'org.bouncycastle:bcprov-jdk15on:1.51' - compile 'net.java:otr4j:0.22' + compile 'org.jitsi:org.otr4j:0.22' compile 'org.gnu.inet:libidn:1.15' compile 'com.google.zxing:core:3.1.0' compile 'com.google.zxing:android-integration:3.1.0' diff --git a/docs/XEPs.md b/docs/XEPs.md index 95282c6d..1b9ea6af 100644 --- a/docs/XEPs.md +++ b/docs/XEPs.md @@ -2,6 +2,7 @@ * XEP-0030: Service Discovery * XEP-0045: Multi-User Chat * XEP-0048: Bookmarks +* XEP-0085: Chat State Notifications * XEP-0092: Software Version * XEP-0115: Entity Capabilities * XEP-0163: Personal Eventing Protocol (avatars and nicks) |