mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-30 09:07:01 +00: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. |
||
---|---|---|
.. | ||
about.js | ||
admin.js | ||
application.js | ||
common.js | ||
error.js | ||
public-path.js | ||
public.js | ||
share.js |