1
0
puyopuyotetr.is/app
Claire 90528f43bc Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `config/webpack/configuration.js`:
  Upstream updated the `js-yaml` dependency, which changed how to call it.
  Those changes conflicted because that code is pretty different in glitch-soc
  which has to deal with its more complex theming system.
  Proceeded to the same compatibility changes in glitch-soc's code.
- `package.json` and `yarn.lock`:
  Not really a conflict, just glitch-soc-specific dependencies textually too
  close to some dependencies updated upstream.
2021-01-06 18:08:06 +01:00
..
chewy Change tootctl search deploy algorithm (#14300) 2020-07-14 18:10:35 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-12-23 01:47:45 +01:00
mailers Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2020-12-19 00:55:12 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2020-12-19 00:55:12 +01:00
views Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00