From: masensio Date: Wed, 14 May 2014 06:58:04 +0000 (+0200) Subject: Merge branch 'develop' into refactor_update_filelist_from_database X-Git-Tag: oc-android-1.7.0_signed~309^2~28 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/491780ad1db3917aef6763fd2b0420ec9921dcdd?ds=inline;hp=--cc Merge branch 'develop' into refactor_update_filelist_from_database --- 491780ad1db3917aef6763fd2b0420ec9921dcdd