Claire
7623e18124
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream README has been changed, but we have a completely different one.
Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Change the code style to match upstream's but otherwise do not change our
code.
- `spec/lib/sanitize_config_spec.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Kept our version, since the tests are mostly glitch-soc's, except for cases
which are purposefuly different.
2023-03-05 20:46:56 +01:00
..
2023-02-22 09:57:56 +09:00
2022-02-11 14:52:45 +01:00
2023-02-20 06:58:28 +01:00
2023-02-19 07:09:40 +09:00
2022-11-04 16:31:44 +01:00
2020-07-13 19:33:10 +02:00
2021-05-10 17:31:55 +02:00
2020-09-15 14:37:58 +02:00
2022-08-24 19:00:37 +02:00
2022-07-05 02:41:40 +02:00
2022-05-26 22:04:16 +02:00
2019-07-06 23:26:16 +02:00
2023-02-25 14:00:40 +01:00
2022-06-09 21:57:36 +02:00
2023-03-05 20:46:56 +01:00
2020-11-08 00:28:39 +01:00
2019-07-15 00:48:50 +02:00
2022-07-05 02:41:40 +02:00
2022-08-27 00:45:54 +02:00
2022-10-22 23:14:58 +02:00
2023-01-21 15:33:21 +01:00
2020-06-02 19:24:53 +02:00
2022-11-06 09:50:41 +01:00
2023-02-20 06:58:28 +01:00
2023-02-22 09:54:36 +09:00
2023-02-08 07:07:36 +01:00
2023-02-10 22:16:37 +01:00
2023-02-07 03:44:36 +01:00
2023-03-03 21:13:55 +01:00
2022-09-20 23:51:21 +02:00
2023-02-28 22:59:19 +09:00
2019-09-29 16:23:13 +02:00
2020-10-13 01:01:14 +02:00
2023-02-20 06:58:28 +01:00
2023-02-25 14:00:40 +01:00
2022-04-28 18:16:42 +02:00
2022-02-10 00:15:30 +01:00
2023-02-19 07:09:40 +09:00
2021-12-30 08:41:09 +01:00
2023-02-19 10:42:55 +01:00
2019-07-06 23:26:16 +02:00
2023-03-03 20:25:15 +01:00
2022-10-22 18:30:55 +02:00
2023-02-18 12:37:47 +01:00
2022-11-06 09:50:41 +01:00
2022-11-08 17:28:02 +01:00
2023-02-19 07:09:40 +09:00
2023-02-10 22:16:37 +01:00
2023-02-18 12:37:47 +01:00
2023-01-05 13:47:21 +01:00
2022-12-15 18:41:40 +01:00
2023-03-03 21:06:31 +01:00
2020-07-15 21:08:19 +02:00
2020-11-08 00:28:39 +01:00
2019-07-06 23:26:16 +02:00
2019-07-06 23:26:16 +02:00
2022-05-26 22:14:47 +02:00
2023-01-05 13:47:21 +01:00
2022-11-09 08:24:21 +01:00
2023-01-18 17:38:11 +01:00
2023-02-08 07:07:36 +01:00
2023-02-20 06:58:28 +01:00
2022-06-09 21:57:36 +02:00