Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Sun, 6 Sep 2015 18:49:49 +0000 (20:49 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Sun, 6 Sep 2015 18:49:49 +0000 (20:49 +0200)
commitc1e73ec56f341a26d480c5ffe231d871bee1a86d
tree0314912fc3d707e96f25ff6063fbab36be2ad643
parent3f14bc1e27049b60b624d99adfe0da8db5d4fd47
parent5ceecb4a82c2e21bf7f689ec1023dbb2885b980f
Merge branch 'master' of https://github.com/owncloud/android into material_buttons