orbit-basic/config/locales
Christophe Vilayphiou 0f203274a7 Merge branch 'design_team' into ldap
Conflicts:
	config/locales/zh_tw.yml
2012-04-30 08:11:40 +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 08:11:40 +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 08:11:40 +08:00