Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 8 Sep 2015 11:50:02 +0000 (13:50 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 8 Sep 2015 11:50:02 +0000 (13:50 +0200)
commited86a0560aeadbbd4289420f9de5654053c09f55
tree68ea37ecce6c9b81a31ae5d6421c2cbe5c83fd8c
parent6d670fb6786ade61eea01af32c7ccdbd09992bc9
parent1d4b191fb3aec3ec9b635d268b801bba3d6e43e3
Merge branch 'master' of https://github.com/owncloud/android into material_buttons