Thomas Müller 9fac95c2ab Merge branch 'master' into scrutinizer_documentation_patches ... Conflicts: lib/private/appconfig.php		2014-02-14 23:03:27 +01:00
..
image.php	Use dedicated OC_Image loader methods	2013-11-13 00:36:42 +01:00
movies.php	reuse existing helper function OC_Helper::is_function_enabled	2014-01-07 14:52:18 +01:00
mp3.php	Use dedicated OC_Image loader methods	2013-11-13 00:36:42 +01:00
office-cl.php	Use dedicated OC_Image loader methods	2013-11-13 00:36:42 +01:00
office-fallback.php	Use dedicated OC_Image loader methods	2013-11-13 00:36:42 +01:00
office.php	suppress error msg caused by php bug	2014-02-14 11:23:39 +01:00
pdf.php	suppress error msg caused by php bug	2014-02-14 11:23:39 +01:00
provider.php	polish documentation based on scrutinizer patches	2014-02-06 17:02:21 +01:00
svg.php	suppress error msg caused by php bug	2014-02-14 11:23:39 +01:00
txt.php	accept text/markdown as well	2013-10-16 15:31:43 +02:00
unknown.php	suppress error msg caused by php bug	2014-02-14 11:23:39 +01:00