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

Conflicts:
	config/environments/development.rb

2012-05-09 13:51:00 +08:00

..

development.rb

Add mail_settings

2012-05-09 11:38:29 +08:00

production.rb

close alpha on nccu

2012-03-20 14:38:01 +08:00

production.rb.bak

close alpha on nccu

2012-03-20 14:38:01 +08:00

production.rb.cp_from_dev_work

close alpha on nccu

2012-03-20 14:38:01 +08:00

test.rb

Replace PrototypeR4 by Orbit.

2012-03-16 14:58:32 +08:00