mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-12-21 00:19:04 +01:00
f224237862
Conflicts: - `db/schema.rb`: Conflict due to glitch-soc adding the `content_type` column on status edits and thus having a different schema version number. Solved by taking upstream's schema version number, as it is higher than glitch-soc's. |
||
---|---|---|
.. | ||
index.html.haml |