diff options
| author | TheTroll <trolldev@gmail.com> | 2010-03-30 11:11:15 +0200 |
|---|---|---|
| committer | TheTroll <trolldev@gmail.com> | 2010-03-30 11:11:15 +0200 |
| commit | 7c81dd98c16471700f4c2e6c7950d3f9f0c84ecf (patch) | |
| tree | 2a0fff7127036ecb46e3958725c346cdaa0e6555 /min | |
| parent | a07e467cd3cdfb2a8aad52927586394204f78d34 (diff) | |
| parent | da45e75ffa68eb0167bf1d41f743508e2be40dc3 (diff) | |
| download | istreamdev-7c81dd98c16471700f4c2e6c7950d3f9f0c84ecf.tar.gz istreamdev-7c81dd98c16471700f4c2e6c7950d3f9f0c84ecf.tar.bz2 | |
Fixed conflick
Merge branch 'master' of projects.vdr-developer.org:istreamdev
* 'master' of projects.vdr-developer.org:istreamdev:
updated README
default to no compression if browser don't support gzip
removed warning in php
fix min
Conflicts:
bin/backend.php
Diffstat (limited to 'min')
| -rw-r--r-- | min/config.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/min/config.php b/min/config.php index 12dce09..1c30344 100644 --- a/min/config.php +++ b/min/config.php @@ -123,7 +123,7 @@ $min_serveOptions['minApp']['maxFiles'] = 10; * array('//static' => 'D:\\staticStorage') // Windows * </code> */ -//$min_symlinks = array(); +$min_symlinks = array(); /** |