mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-29 06:43:41 +01:00
b135b6ba8f
Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Conflict caused by glitch-soc having a different file size limit constant name. Updated like upstream did while keeping glitch-soc's constant name. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller.rb | ||
oembed_controller.rb |