Merge branch 'development' of github.com:siacs/Conversations into development
This commit is contained in:
commit
75a1cfe337
|
@ -38,7 +38,6 @@ dependencies {
|
||||||
compile 'me.leolin:ShortcutBadger:1.1.1@aar'
|
compile 'me.leolin:ShortcutBadger:1.1.1@aar'
|
||||||
compile 'com.kyleduo.switchbutton:library:1.2.8'
|
compile 'com.kyleduo.switchbutton:library:1.2.8'
|
||||||
compile 'org.whispersystems:axolotl-android:1.3.4'
|
compile 'org.whispersystems:axolotl-android:1.3.4'
|
||||||
compile 'com.kyleduo.switchbutton:library:1.2.8'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
|
Loading…
Reference in a new issue