Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 2 Nov 2015 11:32:48 +0000 (12:32 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 2 Nov 2015 11:32:48 +0000 (12:32 +0100)
commitebca7fcb20843f43d54269f6c7b46f3d2d6859bd
tree13e2f7c08f64749662dfbaa7df28679804a7fc39
parentef80135674470b6159f94b0606548ef3aa10f994
parent8110be015585c05fdd675233a5defca8d014298f
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab