orbit-basic/vendor/built_in_modules/announcement/config/locales
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
..
en.yml fix for 0924 2012-09-24 18:30:19 +08:00
zh_tw.yml Merge branch 'sidebar_config' into ntu 2013-01-08 14:17:21 +08:00