Merge remote-tracking branch 'origin/t/snackbar' into development

Conflicts: OpenKeychain/build.gradle
2015-01-29 09:55:09 +01:00
parent 81d4d31fd7 198ddfeff7
commit 5564f65a69
11 changed files with 370 additions and 214 deletions
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -27,6 +27,7 @@ dependencies {
    compile 'com.google.zxing:core:3.0.1'
    compile 'com.jpardogo.materialtabstrip:library:1.0.8'
    compile 'it.neokree:MaterialNavigationDrawer:1.3'
+    compile 'com.nispok:snackbar:2.7.4'
 }

 android {