Fu Matthew 76296ab29b Merge branch 'sidebar_config' into ntu ... Conflicts: app/controllers/admin/object_auths_new_interface_controller.rb app/controllers/orbit_backend_controller.rb app/controllers/orbit_widget_controller.rb app/models/module_app.rb app/views/admin/page_parts/_module_widget.html.erb config/locales/zh_tw.yml lib/parsers/parser_common.rb lib/parsers/parser_front_end.rb		2013-01-08 14:17:21 +08:00
..
assets	Changes for widgets	2012-05-13 21:55:39 +08:00
controllers	Merge branch 'various_bugs' into nccu_master	2012-10-29 16:10:07 +08:00
helpers	Fix link for ad_banner	2013-01-07 00:36:48 +08:00
mailers	edit tags	2012-02-15 15:38:27 +08:00
models	Add time to announcement quick edit	2012-08-14 14:38:21 +08:00
views	Merge branch 'sidebar_config' into ntu	2013-01-08 14:17:21 +08:00