Merge branch 'jobs_and_mail' into ldap
Conflicts: config/environments/development.rb config/routes.rb
This commit is contained in:
commit
65a0998080
16 files changed
+213
-12
Reference in new issue
Block a user