mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-30 23:33:42 +01:00
d8b0a732aa
Conflicts: - `config/initializers/simple_form.rb`: Upstream added a new simple_form component, where we had an extra one. Kept both components. |
||
---|---|---|
.. | ||
_status.html.haml | ||
index.html.haml |