orbit-basic/config/locales
Christophe Vilayphiou ebc8dd33ec Merge branch 'design_team' into ldap
Conflicts:
	Gemfile.lock
	app/controllers/admin/module_apps_controller.rb
	app/controllers/application_controller.rb
	vendor/built_in_modules/web_resource/web_resource.json
2012-05-14 00:57:17 +08:00
..
devise.en.yml LDAP with sync rake task 2012-03-06 16:41:06 +08:00
devise.zh_tw.yml LDAP with sync rake task 2012-03-06 16:41:06 +08:00
en.yml New Interface for App Auth and Object Auth 2012-05-14 00:50:12 +08:00
rails.yml Add asset model and controller 2010-02-01 17:24:28 +08:00
zh_tw.yml Merge branch 'design_team' into ldap 2012-05-14 00:57:17 +08:00