mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-25 21:23:42 +01:00
e4f8679eae
Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it. |
||
---|---|---|
.. | ||
_attachment_list.html.haml | ||
_detailed_status.html.haml | ||
_og_description.html.haml | ||
_og_image.html.haml | ||
_poll.html.haml | ||
_simple_status.html.haml | ||
_status.html.haml | ||
embed.html.haml | ||
show.html.haml |