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

Sitemap with main

2012-07-27 19:13:39 +08:00

controllers

remove cache

2012-07-27 19:14:24 +08:00

helpers

Remove i18n_variable for controllers, helpers and models

2012-07-27 19:13:39 +08:00

jobs

NCCU 上傳版本 0709

2012-07-09 16:02:59 +08:00

mailer

Add mail_settings

2012-05-09 11:38:29 +08:00

models

Merge branch 'changing_tag'

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

uploaders

Comment out filename in FIleAssetUploader

2012-05-17 23:34:15 +08:00

views

Sitemap done for backend and fronted

2012-07-27 19:13:40 +08:00