e590177b29
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. |
||
---|---|---|
.. | ||
activitypub | ||
account_relationships_presenter.rb | ||
initial_state_presenter.rb | ||
instance_presenter.rb | ||
status_relationships_presenter.rb |