Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
authorAndy Scherzinger <info@andy-scherzinger.de>
Thu, 6 Aug 2015 15:23:02 +0000 (17:23 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Thu, 6 Aug 2015 15:23:02 +0000 (17:23 +0200)
commit9d9efd1c1ded9c225c16be80f4b648018839f3ef
treec3bfaeec883a643f203738ed3f012735a243dad7
parenta257935b8c81c3d6d4672290e38d1f3b98cca392
parent419dbeabec4421fa9045f2a92794b614bd063a11
Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar

Conflicts:
owncloud-android-library
res/values-de-rDE/strings.xml
res/values-de/strings.xml
res/values/strings.xml
src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java