1
0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-03-02 02:11:46 -05:00
Vincent Breitmoser 40703fe961 Merge branch 'master' into development
Conflicts:
	OpenKeychain/src/main/res/values/strings.xml
2015-05-28 16:37:15 +02:00
..