This repository has been archived on 2024-03-16. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Christophe Vilayphiou d88d4e58dc Merge branch 'design_team' into ldap ...

Conflicts:
	config/environments/development.rb

2012-05-09 13:51:00 +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

Hide some links in side_bar for site_settings

2012-05-09 12:53:42 +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-09 13:51:00 +08:00