Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream ... 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.		2020-12-15 14:27:06 +01:00
..
accept.rb	…
add.rb	…
announce.rb	…
block.rb	…
create.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
delete.rb	Fix sending spurious Rejects when processing remote account deletion (#15104)	2020-11-19 17:39:47 +01:00
flag.rb	…
follow.rb	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00
like.rb	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00
move.rb	Fix Move handler not being triggered when failing to fetch target (#15107)	2020-11-09 01:41:52 +01:00
reject.rb	…
remove.rb	…
undo.rb	…
update.rb	…