mastodon-docker-playground/app
Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `db/schema.rb`:
  Conflict due to glitch-soc adding the `content_type` column on status edits
  and thus having a different schema version number.
  Solved by taking upstream's schema version number, as it is higher than
  glitch-soc's.
2022-02-17 10:58:44 +01:00
..
chewy Add trending links (#16917) 2021-11-25 13:07:38 +01:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
mailers Add appeals (#17364) 2022-02-14 21:27:53 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2022-02-11 21:53:20 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2022-02-12 11:12:41 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2022-02-08 18:23:53 +01:00
views Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-02-12 11:12:41 +01:00