Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Wed, 9 Sep 2015 09:42:11 +0000 (11:42 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Wed, 9 Sep 2015 09:42:11 +0000 (11:42 +0200)
commit0234ca22ea2422f49cb453e8f3030a699cdd94bd
treea61664826814c8215cc7a9e753648a34b57c26c6
parented86a0560aeadbbd4289420f9de5654053c09f55
parent84a4a086d614bd12fef58dd911f1312016013ecc
Merge branch 'master' of https://github.com/owncloud/android into material_buttons