Vincent Breitmoser 4afd6b881e Merge branch 'development' into linked-identities ...

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

2015-03-15 20:02:57 +01:00

..

android/support/v4/widget

Remove unused FixedDrawerLayout

2015-02-23 00:30:02 +01:00

org

Merge branch 'development' into linked-identities

2015-03-15 20:02:57 +01:00