From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 5 Nov 2015 21:26:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/resizedImages' into beta
X-Git-Tag: beta-20151122~42
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8e057b45041897e80e4cbfd44a14c515c0ef5605?ds=inline;hp=8e057b45041897e80e4cbfd44a14c515c0ef5605

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