orbit-basic/config/locales
Matthew K. Fu JuYuan 49e6c33b57 Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config
Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	config/routes.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/init.rb
	vendor/built_in_modules/archive/init.rb
	vendor/built_in_modules/miss_module/config/locales/zh_tw.yml
2012-12-25 11:01:36 +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 Change the design for the whole site form designs index 2012-12-07 12:14:31 +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 Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config 2012-12-25 11:01:36 +08:00