Claire
193250556c
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have our own.
Kept ours.
- `app/helpers/application_helper.rb`:
Minor code style fix upstream, on a line that is different in glitch-soc
due to the different theming system.
Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
Code style fix on a line next to lines exclusive to glitch-soc.
Applied upstream changes.
- `yarn.lock`:
Upstream updated a dependency textually close to a glitch-soc-only
dependency.
Updated the dependency like upstream did.
2023-03-16 23:12:59 +01:00
..
2023-02-22 09:55:31 +09:00
2023-03-10 13:33:30 +01:00
2023-02-25 14:00:40 +01:00
2023-03-10 13:33:30 +01:00
2023-03-04 17:16:45 +01:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-03-02 16:21:04 +01:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-03-04 17:12:09 +01:00
2023-02-22 09:55:31 +09:00
2023-02-20 13:24:14 +09:00
2023-03-04 16:43:47 +01:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-03-04 17:16:45 +01:00
2023-02-22 09:55:31 +09:00
2023-03-04 17:12:09 +01:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-03-04 17:16:45 +01:00
2023-02-20 13:24:14 +09:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-03-04 17:16:45 +01:00
2023-03-04 17:12:09 +01:00
2023-03-04 17:12:09 +01:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-03-04 16:43:47 +01:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-02-25 14:00:40 +01:00
2023-03-04 17:12:09 +01:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-03-04 17:00:00 +01:00
2023-02-22 09:55:31 +09:00
2023-03-04 17:16:45 +01:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-03-04 17:16:45 +01:00
2023-02-22 09:55:31 +09:00
2023-03-04 17:12:09 +01:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-03-04 17:00:00 +01:00
2023-03-04 17:16:45 +01:00
2023-02-27 09:31:15 +01:00
2023-03-04 16:43:47 +01:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-03-04 16:43:47 +01:00
2023-02-25 14:00:40 +01:00
2020-05-08 20:17:16 +02:00
2023-02-22 09:55:31 +09:00
2023-02-20 13:24:14 +09:00
2023-02-22 09:55:31 +09:00
2023-03-04 17:12:09 +01:00
2023-03-04 17:16:45 +01:00
2023-02-22 09:55:31 +09:00
2023-02-20 05:00:48 +01:00
2023-02-20 13:24:14 +09:00
2017-11-14 20:44:11 +01:00
2023-03-04 17:16:45 +01:00
2023-02-22 09:55:31 +09:00
2023-03-16 23:12:59 +01:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-02-25 14:00:40 +01:00
2023-02-22 09:55:31 +09:00
2023-02-20 06:58:28 +01:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00
2023-02-22 09:55:31 +09:00