Christophe Vilayphiou 2eeb530422 Merge branch 'master' into ldap ... Conflicts: app/assets/stylesheets/new_admin.css.erb		2012-04-23 14:13:37 +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 'master' into ldap	2012-04-23 14:13:37 +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-23 14:13:37 +08:00