Matthew K. Fu JuYuan ca290f3519 Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config ... Conflicts: app/views/layouts/_side_bar_content.html.erb config/locales/zh_tw.yml config/mongoid.yml vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb vendor/built_in_modules/announcement/init.rb		2012-12-05 11:36:32 +08:00
..
assets	stupid bug fixed	2012-12-04 00:31:46 +08:00
controllers	Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config	2012-12-05 11:36:32 +08:00
helpers	Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config	2012-12-05 11:36:32 +08:00
jobs	merge	2012-10-01 21:09:09 +08:00
mailer	Add mail_settings	2012-05-09 11:38:29 +08:00
models	Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config	2012-12-05 11:36:32 +08:00
uploaders	Remove news and fix default_url in ImageUploader	2012-11-22 09:30:25 +08:00
views	Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config	2012-12-05 11:36:32 +08:00