Claire ed5d57dac3 Merge commit '4456f65da4da07b37132130d9049c6684d379085' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-nightly.yml`: Upstream changed the environment variables used for defining the version number. This change occurs close to lines that were modified in glitch-soc to account for the different repositories to push to. Ported upstream changes. - `.github/workflows/build-push-pr.yml`: Upstream changed the environment variables used for defining the version number. This change occurs close to lines that were modified in glitch-soc to account for the different repositories to push to. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream changed how the version string is built from environment variables. Adapted the logic to account for the `+glitch` in glitch-soc.		2023-09-02 11:56:09 +02:00
..
ISSUE_TEMPLATE	Improve the bug report templates (#25621)	2023-07-21 10:46:12 +02:00
workflows	Merge commit '4456f65da4da07b37132130d9049c6684d379085' into glitch-soc/merge-upstream	2023-09-02 11:56:09 +02:00
FUNDING.yml	Remove references to discourse.joinmastodon.org (#17797)	2022-03-15 08:13:22 +01:00
renovate.json5	Fix `lint:json` not processing `json5` extension (#26481)	2023-08-14 14:53:13 +02:00
stale.yml	Change stale bot to only touch pull requests over 120 days old (#12217)	2019-10-26 12:45:52 +02:00
stylelint-matcher.json	Set-up Problem Matchers (#18598)	2022-06-16 22:09:43 +02:00