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
..
admin	Translation changes	2012-12-03 23:00:04 +08:00
desktop	can add relation between co-author	2012-12-04 00:31:06 +08:00
admin_helper.rb	default widgets and sidebar.	2012-12-03 18:52:36 +08:00
application_helper.rb	Translation changes	2012-12-03 23:00:04 +08:00
attribute_fields_helper.rb	Translation changes	2012-12-03 23:00:04 +08:00
attribute_values_helper.rb	Translation changes	2012-12-03 23:00:04 +08:00
orbit_backend_helper.rb	Merge branch 'various_bugs' into nccu_master	2012-10-29 16:10:07 +08:00