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

Merge branch 'development' into linked-identities

Browse Source 
Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
This commit is contained in:
Vincent Breitmoser
2015-04-09 13:57:56 +02:00
parent d27925ad19 dcaac4f85f
commit a4b7daf266
236 changed files with 10295 additions and 8379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenKeychain/src/main/AndroidManifest.xml
View File

@@ -3,8 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
package="org.sufficientlysecure.keychain"
android:installLocation="auto"
android:versionCode="31202"
android:versionName="3.2beta2">
android:versionCode="31203"
android:versionName="3.2beta3">
<!--
General remarks
@@ -701,6 +701,9 @@
<service
android:name=".service.KeychainIntentService"
android:exported="false" />
<service
android:name=".service.CloudImportService"
android:exported="false" />
<provider
android:name=".provider.KeychainProvider"