Christophe Vilayphiou c062b43069 Merge branch 'design_team' into ldap

2012-05-23 12:11:38 +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

Put inc/ajax_setting in new_admin

2012-05-22 16:11:00 +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-23 12:11:38 +08:00