Claire
fe5f6bc7ed
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Fix erroneous deletion in a previous merge.
- `Gemfile`:
Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
Minor conflict due to glitch-soc having an extra `local_only` property
2022-06-28 11:11:18 +02:00
..
2022-06-28 11:11:18 +02:00
2022-03-25 21:00:59 +01:00
2019-07-02 00:34:38 +02:00
2022-05-22 22:16:43 +02:00
2019-09-29 21:31:51 +02:00
2019-07-07 16:16:51 +02:00
2022-05-26 23:02:42 +02:00
2021-03-24 10:53:50 +01:00
2022-04-28 17:47:34 +02:00
2021-04-17 14:55:46 +02:00
2021-10-14 20:44:59 +02:00
2022-05-24 10:24:59 +02:00
2022-05-26 22:03:54 +02:00
2020-11-19 17:38:06 +01:00
2022-04-28 17:47:34 +02:00
2022-05-09 07:43:08 +02:00
2021-03-18 00:41:32 +01:00
2022-03-30 14:46:03 +02:00
2021-09-29 23:52:36 +02:00
2020-10-12 16:33:49 +02:00
2022-06-28 11:11:18 +02:00
2017-01-12 20:46:24 +01:00
2022-03-28 22:21:37 +02:00
2020-06-02 19:24:53 +02:00
2022-03-25 19:31:35 +01:00
2021-09-26 05:46:13 +02:00
2022-03-26 02:53:34 +01:00
2021-04-24 17:01:43 +02:00
2020-04-05 14:40:08 +02:00
2022-04-29 22:43:07 +02:00
2019-07-02 00:34:38 +02:00
2021-11-05 23:23:05 +01:00
2020-06-30 23:58:02 +02:00
2022-03-01 16:48:58 +01:00
2022-03-01 16:48:58 +01:00
2019-08-16 13:00:30 +02:00
2022-04-08 21:21:49 +02:00
2018-05-03 10:41:58 +02:00
2019-07-07 16:16:51 +02:00
2022-01-19 22:37:27 +01:00
2022-04-06 20:58:12 +02:00
2022-05-31 18:25:24 +02:00
2022-03-26 02:53:34 +01:00
2022-01-16 22:26:18 +01:00
2019-09-23 17:25:10 +02:00
2022-05-25 12:27:11 +02:00
2021-03-01 04:59:13 +01:00
2022-02-22 17:11:22 +01:00
2020-05-14 23:28:06 +02:00
2022-05-01 00:37:46 +02:00