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)
Conflicts:
owncloud-android-library


No differences found