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

Conflicts:
	Gemfile
	app/models/ad_banner.rb

2012-05-15 23:02:22 +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

Add impressionist

2012-05-15 21:26:09 +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-15 23:02:22 +08:00