Christophe Vilayphiou 23854e7adc Merge branch 'i18n_var' of github.com:Rulingcom/NCCU into i18n_var ... Conflicts: app/controllers/pages_controller.rb app/models/item.rb app/models/site.rb config/environments/development.rb vendor/built_in_modules/announcement/app/models/bulletin.rb		2012-07-27 19:21:39 +08:00
..
announcement	Merge branch 'i18n_var' of github.com:Rulingcom/NCCU into i18n_var	2012-07-27 19:21:39 +08:00
news	Remove i18n_variable for news	2012-07-27 19:12:58 +08:00
page_content	Fix error in i18n_variable removal for page_content	2012-07-27 19:12:59 +08:00
web_resource	Remove i18n_variable for web_resource	2012-07-27 19:12:59 +08:00