From: masensio <masensio@solidgear.es>
Date: Mon, 7 Sep 2015 08:47:05 +0000 (+0200)
Subject: Merge pull request #1095 from owncloud/text_file_preview_pr_707_with_develop
X-Git-Tag: oc-android-1.8~17
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/22f0f59991d07b806fb01b010c6a37e6cb7ae312?ds=inline;hp=--cc

Merge pull request #1095 from owncloud/text_file_preview_pr_707_with_develop

Text file preview pr 707 with develop
---

22f0f59991d07b806fb01b010c6a37e6cb7ae312