mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-07 23:44:33 +00:00
1b6a21e6bc
Conflicts: - `app/validators/status_length_validator.rb`: Conflict due to glitch-soc's configurable maximum toot chars. Ported upstream changes. |
||
---|---|---|
.. | ||
_action_log.html.haml | ||
index.html.haml |