From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sat, 21 Nov 2015 08:50:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/resizedImages' into beta
X-Git-Tag: beta-20151122~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c3217b323a606cd629a5ae4321698e6cc83eb4de

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

c3217b323a606cd629a5ae4321698e6cc83eb4de