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
..
assets	Changes for widgets	2012-05-13 21:55:39 +08:00
controllers	make sure no pending news or announcement will be searched out	2012-07-30 14:39:40 +08:00
helpers	Remove i18n_variable for announcement	2012-07-27 19:12:58 +08:00
mailers	merge with master	2012-01-11 20:31:52 +08:00
models	make sure no pending news or announcement will be searched out	2012-07-30 14:39:40 +08:00
views	Merge branch 'changing_tag'	2012-07-30 14:43:53 +08:00