From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 29 Oct 2015 17:41:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/sortInUploadFilesActivity' into beta
X-Git-Tag: beta-20151122~83
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c7a3b092ceb08ad2f74d66d660cf82244c328311?hp=c7a3b092ceb08ad2f74d66d660cf82244c328311

Merge remote-tracking branch 'remotes/upstream/sortInUploadFilesActivity' into beta
---