Dominik Schürmann 5564f65a69 Merge remote-tracking branch 'origin/t/snackbar' into development ... Conflicts: OpenKeychain/build.gradle		2015-01-29 09:55:09 +01:00
..
src/main	Merge remote-tracking branch 'origin/t/snackbar' into development	2015-01-29 09:55:09 +01:00
.gitignore	Fix gitignore for lint	2014-04-09 16:36:28 +02:00
build.gradle	Merge remote-tracking branch 'origin/t/snackbar' into development	2015-01-29 09:55:09 +01:00