diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-08-11 13:37:19 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-08-11 13:37:19 +0200 |
| commit | eac4bf7d902dc2579983daa29bcb74ca14790de6 (patch) | |
| tree | 1139702220deb293c2f68d712280ff81e5b23f7c /src/main/AndroidManifest.xml | |
| parent | 92864c6696cf776de356f5e9bbe403a691c8746d (diff) | |
| parent | 4a051b65d1ee004aeea3bcb0a20d0bde1d2200ae (diff) | |
Merged 1.5.2 into trz/master with conflicts resolved
Diffstat (limited to '')
| -rw-r--r-- | src/main/AndroidManifest.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index e4e91d80..9fe37017 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -122,6 +122,13 @@ <data android:mimeType="*/*" /> </intent-filter> + <intent-filter> + <action android:name="android.intent.action.SEND_MULTIPLE" /> + + <category android:name="android.intent.category.DEFAULT" /> + + <data android:mimeType="image/*" /> + </intent-filter> </activity> <activity android:name="de.duenndns.ssl.MemorizingActivity" |