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
..
devise.en.yml	add i18n variables	2012-10-26 11:19:56 +08:00
devise.zh_tw.yml	Clean translations	2012-12-04 00:17:12 +08:00
en.yml	Fix some translations	2012-12-04 01:03:28 +08:00
mongoid.zh_tw.yml	Clean translations	2012-12-04 00:17:12 +08:00
rails.zh_tw.yml	Clean translations	2012-12-04 00:17:12 +08:00
social_share_button.en.yml	first version of fb_share	2012-08-08 11:04:19 +08:00
social_share_button.zh-tw.yml	first version of fb_share	2012-08-08 11:04:19 +08:00
zh_tw.yml	Fix some translations	2012-12-04 01:03:28 +08:00