merge

Gemfile

Gemfile.lock

app/mailers/application_mailer.rb

app/mailers/devise_mailer.rb

app/models/university.rb

app/models/university/with_identifier.rb

app/models/user.rb

app/models/user/with_devise.rb

app/services/sendinblue/sms_service.rb

app/views/admin/universities/index.html.erb

app/views/admin/universities/show.html.erb

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

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

config/application.rb

config/initializers/devise.rb

config/initializers/send_in_blue.rb

db/migrate/20211008115910_set_default_role_to_users.rb

db/migrate/20211008125457_add_mail_from_to_universities.rb

db/schema.rb

test/fixtures/universities.yml