From: masensio Date: Wed, 2 Sep 2015 11:29:14 +0000 (+0200) Subject: Merge branch 'text_file_preview_pr_707_with_develop' of github.com:owncloud/android... X-Git-Tag: oc-android-1.8~17^2~4 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6b84d83b3544f8de4e56186f6ecbccd3d612702b?ds=inline Merge branch 'text_file_preview_pr_707_with_develop' of github.com:owncloud/android into text_file_preview_pr_707_with_develop --- 6b84d83b3544f8de4e56186f6ecbccd3d612702b