cd99255698
Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both. |
||
---|---|---|
.. | ||
assets | ||
devise | ||
generators | ||
mastodon | ||
paperclip | ||
tasks | ||
templates | ||
cli.rb |