mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-10-21 01:37:34 +02:00
68629f2773
Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
schema.rb | ||
seeds.rb |