Merge master into oauth_login

[pub/Android/ownCloud.git] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index eb8ad28..3a0d399 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,8 +17,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
  -->\r
 <manifest package="com.owncloud.android"\r
-    android:versionCode="103014"\r
-    android:versionName="1.3.14" xmlns:android="http://schemas.android.com/apk/res/android">\r
+    android:versionCode="103017"\r
+    android:versionName="1.3.17" xmlns:android="http://schemas.android.com/apk/res/android">\r
 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r
@@ -141,7 +141,9 @@
         <activity android:name=".extensions.ExtensionsListActivity"></activity>\r
         <activity android:name=".ui.activity.AccountSelectActivity" android:uiOptions="none" android:label="@string/prefs_accounts"></activity>\r
         <activity android:name=".ui.activity.ConflictsResolveActivity"/>
-            
+        <activity android:name=".ui.activity.GenericExplanationActivity"/>\r
+        <activity android:name=".ui.activity.ErrorsWhileCopyingHandlerActivity"/>\r
+        
         <service android:name=".files.services.FileUploader" >\r
         </service>
         <service android:name=".files.services.InstantUploadService" />