cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/development' into linked-identities

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
	OpenKeychain/src/main/res/menu/decrypt_menu.xml
This commit is contained in:
Vincent Breitmoser
2015-04-26 01:02:22 +02:00
parent d6d678dae3 c442d3bd0d
commit 1865852ccc
55 changed files with 1113 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Graphics/get-material-icons.sh
View File

@@ -41,6 +41,8 @@ python copy OpenKeychain navigation grey chevron_left 24
python copy OpenKeychain navigation grey chevron_right 24
python copy OpenKeychain social grey person 48
python copy OpenKeychain communication grey email 24
python copy OpenKeychain social black share 24
python copy OpenKeychain content black content_copy 24
# navigation drawer sections
python copy OpenKeychain communication black vpn_key 24