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/i18n/en_US/upload.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/i18n/en_US/upload.php')
| -rw-r--r-- | system/i18n/en_US/upload.php | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/system/i18n/en_US/upload.php b/system/i18n/en_US/upload.php deleted file mode 100644 index 7f6e216d..00000000 --- a/system/i18n/en_US/upload.php +++ /dev/null @@ -1,6 +0,0 @@ -<?php defined('SYSPATH') OR die('No direct access allowed.'); - -$lang = array -( - 'not_writable' => 'The upload destination folder, %s, does not appear to be writable.', -);
\ No newline at end of file |