diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
| commit | 3060a6f662da66008d57a461bf1c9b5b4aa2b002 (patch) | |
| tree | 442fd290505817efc0324f2af6e01805cb7396aa /system/config/cache_xcache.php | |
| parent | 1cd6a615bb47a33794e4a4f690c87a348ab752d7 (diff) | |
| parent | 32d25dafd5b033338b6a9bb8c7c53edab462543a (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/gallery/controllers/albums.php
modules/gallery/controllers/movies.php
modules/gallery/controllers/photos.php
Diffstat (limited to 'system/config/cache_xcache.php')
| -rw-r--r-- | system/config/cache_xcache.php | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/system/config/cache_xcache.php b/system/config/cache_xcache.php deleted file mode 100644 index 47aac25a..00000000 --- a/system/config/cache_xcache.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php defined('SYSPATH') OR die('No direct access allowed.'); -/** - * @package Cache:Xcache - * - * Xcache administrator username. - */ -$config['PHP_AUTH_USER'] = 'kohana'; - -/** - * Xcache administrator password. - */ -$config['PHP_AUTH_PW'] = 'kohana'; |