mastodon/app
Claire b81710c02c Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `CONTRIBUTING.md`:
  Not a real conflict, glitch-soc quotes the upstream file, which has been
  changed. Update the quote.
2021-01-26 14:01:30 +01:00
..
chewy Change `tootctl search deploy` algorithm (#14300) 2020-07-14 18:10:35 +02:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2021-01-21 16:51:12 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2021-01-26 14:01:30 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-01-26 14:01:30 +01:00
mailers Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2021-01-26 14:01:30 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2020-12-19 00:55:12 +01:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2021-01-26 14:01:30 +01:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2021-01-26 14:01:30 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2021-01-26 14:01:30 +01:00
views Merge branch 'main' into glitch-soc/merge-upstream 2021-01-21 16:51:12 +01:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00