diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-04-26 11:43:46 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-04-26 11:43:46 +0000 |
| commit | 18913c4cd8bebc6391612f472330a008ce30a19b (patch) | |
| tree | 2ef151761b131bb110ca86bb83b2bf78faab661f /changelog.d | |
| parent | 3b2d7cc67f8ee7c727654cc0f2631611154184cd (diff) | |
| parent | 1a50db36d3f40d25525128a45adc23038525d882 (diff) | |
| download | pleroma-18913c4cd8bebc6391612f472330a008ce30a19b.tar.gz pleroma-18913c4cd8bebc6391612f472330a008ce30a19b.zip | |
Merge branch 'tusooa/combine-login' into 'develop'
Work around docker login needing daemon
See merge request pleroma/pleroma!3877
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/3877.skip | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/changelog.d/3877.skip b/changelog.d/3877.skip new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/changelog.d/3877.skip |