moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-11 11:45:01 -05:00
Code Issues Releases Wiki Activity

Merge branch 'development' of github.com:siacs/Conversations into development

Browse Source
This commit is contained in:
iNPUTmice 2015-02-23 13:10:33 +01:00
commit 37e9db3299
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@ -20,9 +20,6 @@ allprojects {
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
repositories { repositories {
maven {
url "http://jitsi.github.com/otr4j/repository/"
}
jcenter() jcenter()
mavenCentral() mavenCentral()
} }
@ -32,7 +29,7 @@ dependencies {
compile project(':libs:MemorizingTrustManager') compile project(':libs:MemorizingTrustManager')
compile 'com.android.support:support-v13:21.0.3' compile 'com.android.support:support-v13:21.0.3'
compile 'org.bouncycastle:bcprov-jdk15on:1.51' 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 'org.gnu.inet:libidn:1.15'
compile 'com.google.zxing:core:3.1.0' compile 'com.google.zxing:core:3.1.0'
compile 'com.google.zxing:android-integration:3.1.0' compile 'com.google.zxing:android-integration:3.1.0'

1
docs/XEPs.md
View File

@ -2,6 +2,7 @@
* XEP-0030: Service Discovery * XEP-0030: Service Discovery
* XEP-0045: Multi-User Chat * XEP-0045: Multi-User Chat
* XEP-0048: Bookmarks * XEP-0048: Bookmarks
* XEP-0085: Chat State Notifications
* XEP-0092: Software Version * XEP-0092: Software Version
* XEP-0115: Entity Capabilities * XEP-0115: Entity Capabilities
* XEP-0163: Personal Eventing Protocol (avatars and nicks) * XEP-0163: Personal Eventing Protocol (avatars and nicks)