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/mimes.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/mimes.php')
| -rw-r--r-- | system/config/mimes.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/config/mimes.php b/system/config/mimes.php index 6a960f24..c4318d58 100644 --- a/system/config/mimes.php +++ b/system/config/mimes.php @@ -6,7 +6,7 @@ * the operating system MIME list. * * If there are any missing options, please create a ticket on our issue tracker, - * http://kohanaphp.com/trac/newticket. Be sure to give the filename and + * http://dev.kohanaphp.com/projects/kohana2. Be sure to give the filename and * expected MIME type, as well as any additional information you can provide. */ $config = array |