-
Thibaut Girka authored
Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.
cd992556
Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.