Merge branch 'master' of github.com:noesya/osuny

Gemfile

Gemfile.lock

app/assets/javascripts/admin.js

app/assets/javascripts/admin/university/edit.js

app/assets/javascripts/admin/university/init.js

app/controllers/server/universities_controller.rb

app/controllers/users/omniauth_callbacks_controller.rb

app/models/university/with_sso.rb

app/models/user.rb

app/models/user/with_authentication.rb

app/models/user/with_omniauth.rb

app/views/devise/sessions/new.html.erb

app/views/server/layouts/application.html.erb

app/views/server/universities/_form.html.erb

config/initializers/devise.rb

config/locales/en.yml

config/locales/fr.yml

config/locales/university/en.yml

config/locales/university/fr.yml

config/routes.rb