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

This commit is contained in:
Daniel Gultsch 2015-07-20 15:43:54 +02:00
commit 75a1cfe337
1 changed files with 0 additions and 1 deletions

View File

@ -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 {