Christophe Vilayphiou 65a0998080 Merge branch 'jobs_and_mail' into ldap ...

Conflicts:
	config/environments/development.rb
	config/routes.rb

2012-05-08 11:45:34 +08:00

..

development.rb

Merge branch 'jobs_and_mail' into ldap

2012-05-08 11:45:34 +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