Merge branch 'beta' of github.com:owncloud/android into beta
authortobiasKaminsky <tobias@kaminsky.me>
Mon, 30 Nov 2015 20:48:06 +0000 (21:48 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Mon, 30 Nov 2015 20:48:06 +0000 (21:48 +0100)
commit9fec706b31cad885e3b9dd72c68750aeebd6f464
treeab7c4cdd5061f9569ffb16190ed8b490d04bf9c8
parent88c56e5fe131717869e7dd0b53d046352bdc257a
parentbd93cc1d66ecbc932493baf194037c8499329fae
Merge branch 'beta' of github.com:owncloud/android into beta