Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 5 Oct 2015 16:51:00 +0000 (18:51 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 5 Oct 2015 16:51:00 +0000 (18:51 +0200)
commitb40a987519abf85d93108df077d9a54a316ed448
treeba4cdf6a4ba0fcf50acb19ec128d61e482cc77d0
parent96e02ff0912b3cd725c96bd5729748fb86a39867
parenteddd3aa450f9342c0f04faaebd702055e4033f3c
Merge branch 'master' of https://github.com/owncloud/android into material_fab