mirror of
https://github.com/mastodon/mastodon.git
synced 2025-10-28 19:51:35 +00:00
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. |
||
|---|---|---|
| .. | ||
| migrate | ||
| post_migrate | ||
| views | ||
| schema.rb | ||
| seeds.rb | ||