Claire
3c7dbf3a16
Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' 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
..
2023-08-07 13:37:54 +02:00
2023-08-07 13:37:54 +02:00
2023-08-14 14:54:31 +02:00
2023-08-14 14:54:31 +02:00
2023-08-10 09:47:42 +02:00
2023-08-07 13:37:54 +02:00
2023-07-26 13:46:16 +02:00
2023-08-07 13:37:54 +02:00
2023-07-26 13:46:16 +02:00
2023-08-10 09:47:42 +02:00
2023-08-07 13:37:54 +02:00
2023-07-26 13:46:16 +02:00
2023-08-07 13:37:54 +02:00
2023-08-07 13:37:54 +02:00
2023-08-10 09:47:42 +02:00
2023-08-10 09:47:42 +02:00
2023-08-07 13:37:54 +02:00
2023-08-10 09:47:42 +02:00
2023-08-25 22:03:04 +02:00
2023-08-07 13:37:54 +02:00
2023-08-10 09:47:42 +02:00
2023-08-10 09:47:42 +02:00
2023-08-10 09:47:42 +02:00
2023-08-10 09:47:42 +02:00
2023-08-10 09:47:42 +02:00
2023-08-07 13:37:54 +02:00
2023-08-10 09:47:42 +02:00
2023-08-10 09:47:42 +02:00
2023-08-10 09:47:42 +02:00
2023-08-14 14:54:31 +02:00
2023-08-07 13:37:54 +02:00
2023-08-07 13:37:54 +02:00
2023-08-14 14:54:31 +02:00
2023-08-10 09:47:42 +02:00
2023-07-13 11:49:16 +02:00
2023-08-10 09:47:42 +02:00
2023-08-07 13:37:54 +02:00
2023-07-26 13:46:16 +02:00
2023-08-14 14:54:31 +02:00
2023-08-07 13:37:54 +02:00
2023-08-07 13:37:54 +02:00
2023-07-26 13:46:16 +02:00
2023-06-02 15:00:27 +02:00
2023-06-05 09:52:36 +02:00
2023-08-07 13:37:54 +02:00
2023-08-10 09:47:42 +02:00
2023-08-10 09:47:42 +02:00
2023-08-10 09:47:42 +02:00
2023-07-26 13:46:16 +02:00
2023-08-14 14:54:31 +02:00
2023-08-07 13:37:54 +02:00
2023-07-26 13:46:16 +02:00
2023-08-14 14:54:31 +02:00
2023-08-07 13:37:54 +02:00
2023-07-26 13:46:16 +02:00
2023-07-26 13:46:16 +02:00
2023-07-13 14:22:20 +02:00
2023-07-26 13:46:16 +02:00
2023-08-14 14:54:31 +02:00
2023-07-26 13:46:16 +02:00
2023-08-07 13:37:54 +02:00
2023-08-07 13:37:54 +02:00
2023-08-14 14:54:31 +02:00
2023-08-07 13:37:54 +02:00
2023-08-10 09:47:42 +02:00
2023-08-14 14:54:31 +02:00
2023-08-14 14:54:31 +02:00
2023-08-07 13:37:54 +02:00
2023-08-07 13:37:54 +02:00
2023-08-10 09:47:42 +02:00
2023-08-07 13:37:54 +02:00
2023-08-10 09:47:42 +02:00
2023-08-07 13:37:54 +02:00
2023-08-07 13:37:54 +02:00
2023-08-07 13:37:54 +02:00
2023-07-26 13:46:16 +02:00
2023-08-07 13:37:54 +02:00
2023-08-07 13:37:54 +02:00
2023-08-14 14:54:31 +02:00
2023-08-07 13:37:54 +02:00
2023-08-07 13:37:54 +02:00
2023-08-10 09:47:42 +02:00
2023-08-10 09:47:42 +02:00
2023-08-10 09:47:42 +02:00
2023-07-26 13:46:16 +02:00
2023-07-26 13:46:16 +02:00
2023-07-26 13:46:16 +02:00
2023-07-26 13:46:16 +02:00
2023-08-10 09:47:42 +02:00
2023-08-14 14:54:31 +02:00
2023-08-07 13:37:54 +02:00
2023-07-26 13:46:16 +02:00
2023-08-10 09:47:42 +02:00
2023-08-07 13:37:54 +02:00
2023-08-07 13:37:54 +02:00
2023-08-14 14:54:31 +02:00
2023-07-26 13:46:16 +02:00
2023-08-07 13:37:54 +02:00
2023-08-07 13:37:54 +02:00
2023-08-10 09:47:42 +02:00