Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 7 Aug 2015 15:11:04 +0000 (17:11 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 7 Aug 2015 15:11:04 +0000 (17:11 +0200)
commitbbfb414695f57029033d01bf4d26e2c9dcef54a5
tree164e487399626356822d44ceed59431fd80e5c6a
parent4a4296a07e0a632f83cfc306ddaa7f74b4ca6c7b
parent8d4d1bfffb8035653a05b9931d69ef3e5195cf3e
Merge branch 'master' of https://github.com/owncloud/android into material_buttons