Merge pull request #1095 from owncloud/text_file_preview_pr_707_with_develop
authormasensio <masensio@solidgear.es>
Mon, 7 Sep 2015 08:47:05 +0000 (10:47 +0200)
committermasensio <masensio@solidgear.es>
Mon, 7 Sep 2015 08:47:05 +0000 (10:47 +0200)
commit22f0f59991d07b806fb01b010c6a37e6cb7ae312
treecb8d2da5c649a4baab80b9fc7b286454b7c70b24
parent1ff57e0665f138f6558750928012bc0809e52ed0
parent1586eea7cbead33376c015b8a1b743e4cbcaf2a2
Merge pull request #1095 from owncloud/text_file_preview_pr_707_with_develop

Text file preview pr 707 with develop