Thibaut Girka 45deca65b3 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/public.js`:
  Conflict because part of that file has been split to
  `app/javascript/core/settings.js`. Ported those changes
  there.
2020-07-01 19:23:14 +02:00
..
2017-11-24 02:05:53 +01:00
2020-01-23 22:00:13 +01:00
2020-01-23 22:00:13 +01:00
2020-06-02 19:24:53 +02:00
2020-05-24 09:15:23 +02:00
2019-07-30 11:10:46 +02:00
2019-08-19 11:40:42 +02:00
2017-11-18 00:16:48 +01:00
2020-06-02 19:24:53 +02:00
2020-06-02 19:24:53 +02:00
2019-12-01 17:24:33 +01:00
2020-06-02 19:24:53 +02:00
2017-01-13 03:24:41 +01:00