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/inflector.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/inflector.php')
| -rw-r--r-- | system/config/inflector.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/system/config/inflector.php b/system/config/inflector.php index 6dcfc2d3..b6cb8003 100644 --- a/system/config/inflector.php +++ b/system/config/inflector.php @@ -7,6 +7,7 @@ $config['uncountable'] = array 'art', 'baggage', 'dances', + 'data', 'equipment', 'fish', 'fuel', @@ -19,6 +20,7 @@ $config['uncountable'] = array 'information', 'knowledge', 'luggage', + 'metadata', 'money', 'music', 'news', |