Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 26 Oct 2015 12:57:04 +0000 (13:57 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 26 Oct 2015 12:57:04 +0000 (13:57 +0100)
commit2603a351059848dd59b080578a12cd61ca1ed122
tree78b5469a74ce6946b0a15880bce7ab8fb34393d9
parent5c1e6e59bac614ce2b428f949e8ad09022b60080
parent2702951056c4b2dc0e6c085088a467601b331c2d
Merge branch 'master' of https://github.com/owncloud/android into material_buttons