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

..

android/support/v4/widget

Hack to disable overscroll effect of swipe to update

2014-09-13 23:08:04 +02:00

com/haibison/android/lockpattern

Passphrase wizard tests

2015-01-06 14:52:07 +01:00

org

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

2015-01-29 09:55:09 +01:00