orbit-basic/config/locales
Christophe Vilayphiou 20504b2205 Merge branch 'design_team' into ldap
Conflicts:
	app/controllers/admin/page_parts_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
2012-04-30 07:57:20 +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 Merge branch 'design_team' into ldap 2012-04-30 07:57:20 +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-04-30 07:57:20 +08:00