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

Merge branch 'changing_tag'

2012-07-30 14:43:53 +08:00

helpers

Remove i18n_variable for news

2012-07-27 19:12:58 +08:00

mailers

Separate announcement and news

2012-04-30 06:31:46 +08:00

models

Merge branch 'changing_tag'

2012-07-30 14:43:53 +08:00

views

Merge branch 'changing_tag'

2012-07-30 14:43:53 +08:00