Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.
2023-02-25 14:00:40 +01:00
..
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-16 10:23:03 +09:00
2023-02-22 21:16:02 +09:00
2023-02-22 21:16:02 +09:00
2023-02-22 21:16:02 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-22 21:16:02 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-07 02:41:31 +09:00
2023-02-04 15:46:08 +09:00
2023-02-22 21:16:02 +09:00
2023-02-04 15:46:08 +09:00
2023-02-22 21:16:02 +09:00
2023-02-16 10:23:03 +09:00
2023-02-04 15:46:08 +09:00
2023-02-11 05:42:08 +09:00
2023-02-16 10:23:03 +09:00
2023-02-22 21:16:02 +09:00
2023-02-07 02:41:31 +09:00
2023-02-07 02:41:31 +09:00
2023-02-07 02:41:31 +09:00
2023-02-04 15:46:08 +09:00
2023-02-07 02:41:31 +09:00
2023-02-16 10:23:03 +09:00
2023-02-22 21:16:02 +09:00
2023-02-07 02:41:31 +09:00
2023-02-07 02:41:31 +09:00
2023-02-04 15:46:08 +09:00
2023-02-16 10:23:03 +09:00
2023-02-07 02:41:31 +09:00
2023-02-07 02:41:31 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-07 02:41:31 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2017-11-20 22:13:37 -08:00
2023-02-04 15:46:08 +09:00
2023-02-07 02:41:31 +09:00
2023-02-07 02:41:31 +09:00
2023-02-04 15:46:08 +09:00
2023-02-16 10:23:03 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-22 21:16:02 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-22 21:16:02 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-22 21:16:02 +09:00
2023-02-04 15:46:08 +09:00
2023-02-07 02:41:31 +09:00
2023-02-04 15:46:08 +09:00
2023-02-11 05:42:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-16 10:23:03 +09:00
2023-02-07 02:41:31 +09:00
2023-02-16 10:23:03 +09:00
2023-02-22 21:16:02 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-16 10:23:03 +09:00
2023-02-07 02:41:31 +09:00
2023-02-07 02:41:31 +09:00
2023-02-04 15:46:08 +09:00
2023-02-07 02:41:31 +09:00
2023-02-04 15:46:08 +09:00
2023-02-11 05:42:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-22 21:16:02 +09:00
2023-02-07 02:41:31 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-07 02:41:31 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-07 02:41:31 +09:00
2021-04-22 00:04:58 +02:00
2022-11-17 21:59:15 +09:00
2022-11-25 09:40:05 +09:00
2022-11-17 21:59:15 +09:00
2022-12-10 00:12:56 +09:00
2018-05-03 15:54:10 +02:00
2018-05-03 15:54:10 +02:00
2022-11-17 21:59:15 +09:00
2022-06-04 13:44:49 +09:00
2021-04-22 00:04:58 +02:00
2017-12-09 15:35:22 +01:00
2019-04-21 04:52:20 +02:00
2018-01-22 14:20:58 +01:00
2022-11-01 18:42:04 +09:00
2020-07-10 20:57:21 +02:00
2021-04-22 00:04:58 +02:00
2022-12-16 12:46:39 +09:00
2022-11-01 18:42:04 +09:00
2021-04-22 00:04:58 +02:00
2020-11-09 00:56:52 +01:00
2021-04-22 00:04:58 +02:00
2018-05-03 15:54:10 +02:00
2017-06-05 17:02:41 +02:00
2020-12-16 03:24:55 +01:00
2020-07-10 20:57:21 +02:00
2023-02-01 19:59:31 +09:00
2017-05-30 23:09:02 +02:00
2023-02-04 15:46:08 +09:00
2023-02-07 02:41:31 +09:00
2023-02-22 21:16:02 +09:00
2023-02-22 21:16:02 +09:00