Claire
eee36267d6
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
Upstream change too close to a glitch-soc-specific string.
The glitch-soc-specific string should not have been in this file, so it
has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
Upstream refactored a part, that as usual is split and duplicated in various
pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
Upstream fixed custom.css path in a different way than we did, went with
upstream's change.
2022-10-30 18:15:28 +01:00
..
2022-03-18 16:41:51 +01:00
2017-12-10 11:08:04 -08:00
2020-01-20 16:43:18 +01:00
2017-12-10 11:08:04 -08:00
2020-01-20 16:43:18 +01:00
2020-01-20 16:43:18 +01:00
2017-12-10 11:08:04 -08:00
2022-03-18 16:41:51 +01:00
2020-01-20 16:43:18 +01:00
2020-01-20 16:43:18 +01:00
2020-01-20 16:43:18 +01:00
2020-01-20 16:43:18 +01:00
2017-12-10 11:08:04 -08:00
2020-01-20 16:43:18 +01:00
2018-09-30 08:31:50 +02:00
2017-12-10 11:08:04 -08:00
2020-01-20 16:43:18 +01:00
2022-03-18 16:41:51 +01:00
2022-10-05 14:10:15 +02:00
2020-01-20 16:43:18 +01:00
2020-01-20 16:43:18 +01:00
2017-12-10 11:08:04 -08:00
2017-12-10 11:08:04 -08:00
2017-12-10 11:08:04 -08:00
2020-01-20 16:43:18 +01:00
2022-03-18 16:41:51 +01:00
2020-01-20 16:43:18 +01:00
2017-12-10 11:08:04 -08:00
2020-01-20 16:43:18 +01:00
2017-12-10 11:08:04 -08:00
2017-12-10 11:08:04 -08:00
2020-01-20 16:43:18 +01:00
2017-12-10 11:08:04 -08:00
2017-12-10 11:08:04 -08:00
2020-01-20 16:43:18 +01:00
2017-12-10 11:08:04 -08:00
2022-10-30 18:15:28 +01:00
2020-01-20 16:43:18 +01:00
2020-01-20 16:43:18 +01:00
2020-01-20 16:43:18 +01:00
2020-01-20 16:43:18 +01:00
2022-05-31 11:41:30 +02:00
2020-11-12 22:27:44 +01:00
2022-03-18 16:41:51 +01:00
2020-01-20 16:43:18 +01:00
2020-01-20 16:43:18 +01:00
2020-01-20 16:43:18 +01:00
2020-01-20 16:43:18 +01:00
2020-01-20 16:43:18 +01:00
2020-01-20 16:43:18 +01:00
2017-12-10 11:08:04 -08:00
2020-01-20 16:43:18 +01:00
2017-12-10 11:08:04 -08:00
2017-12-10 11:08:04 -08:00
2022-03-18 16:41:51 +01:00
2018-04-27 14:15:38 +02:00
2017-12-10 11:08:04 -08:00
2019-09-18 17:27:12 +02:00
2020-01-20 16:43:18 +01:00
2017-12-10 11:08:04 -08:00
2020-11-12 22:27:44 +01:00
2020-11-12 22:27:44 +01:00
2022-03-18 16:41:51 +01:00
2020-01-20 16:43:18 +01:00
2020-01-20 16:43:18 +01:00
2020-01-20 16:43:18 +01:00
2020-01-20 16:43:18 +01:00
2020-01-20 16:43:18 +01:00
2017-12-10 11:08:04 -08:00
2022-03-18 16:41:51 +01:00
2020-01-20 16:43:18 +01:00
2022-03-18 16:41:51 +01:00
2020-01-20 16:43:18 +01:00
2017-12-10 11:08:04 -08:00
2017-12-10 11:08:04 -08:00
2022-03-18 16:41:51 +01:00
2022-03-18 16:41:51 +01:00
2017-12-10 11:08:04 -08:00
2020-01-20 16:43:18 +01:00
2020-01-20 16:43:18 +01:00
2020-11-12 22:27:44 +01:00
2021-10-07 23:40:18 +02:00
2017-12-10 11:08:04 -08:00
2017-12-10 11:08:04 -08:00