Merge branch 'master' into filetransfer

Conflicts:
	KdeConnect/src/main/AndroidManifest.xml
This commit is contained in:
Albert Vaca
2013-09-20 17:27:59 +02:00

View File

@@ -119,7 +119,7 @@
<activity
android:theme="@style/Theme.AppCompat"
android:name="org.kde.kdeconnect.Plugins.FileTransferPlugin.ShareToReceiver"
android:name="org.kde.kdeconnect.UserInterface.ShareToReceiver"
android:label="KDE Connect"
>
<intent-filter>