From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Fri, 4 Sep 2015 11:16:11 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons
X-Git-Tag: beta-20151128~7^2~39
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/32145d57dbbdde6163664ddfcd8c28b10b134503?ds=inline;hp=--cc

Merge branch 'master' of https://github.com/owncloud/android into material_buttons

Conflicts:
	res/layout/uploader_layout.xml
---

32145d57dbbdde6163664ddfcd8c28b10b134503
diff --cc res/layout/uploader_layout.xml
index d0f9c6ef,79b077dc..9be90b84
--- a/res/layout/uploader_layout.xml
+++ b/res/layout/uploader_layout.xml
@@@ -53,8 -53,8 +53,13 @@@
  	    android:orientation="horizontal" >
  
  		<android.support.v7.widget.AppCompatButton
++<<<<<<< HEAD
 +		    android:id="@+id/uploader_new_folder"
 +			android:theme="@style/Button"
++=======
+ 		    android:id="@+id/uploader_cancel"
+ 			style="@style/ownCloud.Button"
++>>>>>>> f787213cd1cae854c169d263d3636e1de4dffa94
  		    android:layout_width="fill_parent"
  		    android:layout_height="wrap_content"
  		    android:layout_gravity="bottom"