Merge branch 'jobs_and_mail' into ldap

Conflicts:
	config/environments/development.rb
	config/routes.rb
This commit is contained in:
Christophe Vilayphiou committed 2012-05-08 11:45:34 +08:00
commit 65a0998080
16 files changed
+213 -12

No files matched your search

+3
View File
@@ -21,6 +21,9 @@ gem 'mysql2'
gem 'nokogiri'
gem 'radius'
gem 'rake'
gem 'resque' # background jobs
gem 'resque-scheduler' # job scheduling
gem 'resque-restriction'
gem 'ruby-debug19'
gem 'rubyzip'
gem 'therubyracer'