Dominik Schürmann efa5a80eb6 Merge branch 'development' of github.com:open-keychain/open-keychain into development ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java

2014-10-23 23:33:50 +02:00

..

android/support/v4/widget

Hack to disable overscroll effect of swipe to update

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

org

Merge branch 'development' of github.com:open-keychain/open-keychain into development

2014-10-23 23:33:50 +02:00