Merge branch 'master' of github.com:owncloud/android into multiSelect
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 30 Sep 2015 16:40:13 +0000 (18:40 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 30 Sep 2015 16:40:13 +0000 (18:40 +0200)
commit36a635517b2e7c0985f33c1a532927803da4e79a
tree76ed9321dabe3de2457c23a2ee436307e5132e7c
parentf1670314c702223adef71490a787538320e934f7
parent8090269d557590a6d50f184006abef6c9bb7d399
Merge branch 'master' of github.com:owncloud/android into multiSelect