Matthew K. Fu JuYuan 4e1a91ed90 Merge branch 'changing_tag' ... Conflicts: vendor/built_in_modules/news/app/models/news_tag.rb		2012-07-30 14:43:53 +08:00
..
announcement	Merge branch 'changing_tag'	2012-07-30 14:43:53 +08:00
news	Merge branch 'changing_tag'	2012-07-30 14:43:53 +08:00
page_content	Fix error in i18n_variable removal for page_content	2012-07-27 19:12:59 +08:00
web_resource	Remove remaining 18n_variables	2012-07-27 19:37:25 +08:00