Orbit/config/locales
Christophe Vilayphiou 198825a309 Merge branch 'master' into ldap
Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-04-12 18:50:48 +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 close alpha on nccu 2012-03-20 14:38:01 +08:00
rails.yml Add asset model and controller 2010-02-01 17:24:28 +08:00
zh_tw.yml Merge branch 'master' into ldap 2012-04-12 18:50:48 +08:00