mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
cd99255698
Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both. |
||
---|---|---|
.. | ||
assets.rake | ||
auto_annotate_models.rake | ||
db.rake | ||
emojis.rake | ||
glitchsoc.rake | ||
mastodon.rake | ||
repo.rake | ||
statistics.rake |