Merge branch 'development' of github.com:siacs/Conversations into development
This commit is contained in:
commit
37e9db3299
|
@ -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'
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue