Merge branch 'master' of github.com:owncloud/android into multiSelect
authortobiasKaminsky <tobias@kaminsky.me>
Tue, 29 Sep 2015 19:13:31 +0000 (21:13 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Tue, 29 Sep 2015 19:13:31 +0000 (21:13 +0200)
commit9d04b2e53f589f44a18dce26fb674cd3c37038fd
tree7afba3655d0926dc6490d644ef46fef5937799dd
parent71fa16de601a571187f2ed89a40ba796dd2fa455
parent6a9f1ad08c169b645e3120a58febc5d661bc82f2
Merge branch 'master' of github.com:owncloud/android into multiSelect