From: jabarros Date: Wed, 21 Jan 2015 12:06:00 +0000 (+0100) Subject: Merge branch 'imageGrid' into imageGrid_footer X-Git-Tag: oc-android-1.7.0_signed~16^2~11^2~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d57a472a935f06f2136daf15cfc270e237cb4489 Merge branch 'imageGrid' into imageGrid_footer --- d57a472a935f06f2136daf15cfc270e237cb4489