From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 20 Nov 2015 17:36:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/1193_uploader_layout' into beta
X-Git-Tag: beta-20151122~8
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8a9983f7311a6bf46dadd7dc73265db240fa8682?hp=e35e32ad52f3964a44f0f404adf699e0d18502de

Merge remote-tracking branch 'remotes/upstream/1193_uploader_layout' into beta
---