mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-02-08 12:37:56 +00:00
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 |