Merge branch 'develop' of github.com:owncloud/android into switchListVsGrid
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 19 Aug 2015 17:24:33 +0000 (19:24 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 19 Aug 2015 17:24:33 +0000 (19:24 +0200)
commit6af7d56a4250e339ffbfa1711b16bdd0a5e30e5b
treea5fc32a9cf66db8372bc807cf1dab4301ae78529
parentd84dad72e6cc3fb4b2ca83b733d82a5b53ace4c6
parent95db3421f64f2f1dd335757155b1592f474ccb9a
Merge branch 'develop' of github.com:owncloud/android into switchListVsGrid