Conflicts: app/controllers/omniauth_callbacks_controller.rb
Attach a file by drag & drop or click to upload
