diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-10-08 15:44:48 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-10-08 15:44:48 -0500 |
| commit | 77b1ea68a7700ac4a78c7f2e0ea9f118441d23da (patch) | |
| tree | 06243af101a609256b517f48175380a7c4f5bfbb /.gitlab | |
| parent | 4af1b803811cbb59d41f0149706d6dda340b4755 (diff) | |
| parent | 74be4de3f6c2c34447029649526637411acfa9f3 (diff) | |
| download | pleroma-77b1ea68a7700ac4a78c7f2e0ea9f118441d23da.tar.gz pleroma-77b1ea68a7700ac4a78c7f2e0ea9f118441d23da.zip | |
Merge remote-tracking branch 'upstream/develop' into aliases
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/merge_request_templates/Release.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab/merge_request_templates/Release.md b/.gitlab/merge_request_templates/Release.md index 237f74e00..b2c772696 100644 --- a/.gitlab/merge_request_templates/Release.md +++ b/.gitlab/merge_request_templates/Release.md @@ -3,3 +3,4 @@ * [ ] Compile a changelog * [ ] Create an MR with an announcement to pleroma.social * [ ] Tag the release +* [ ] Merge `stable` into `develop` (in case the fixes are already in develop, use `git merge -s ours --no-commit` and manually merge the changelogs) |