diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-08-26 16:37:25 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-08-26 16:37:25 -0500 |
| commit | c199e18bb5b1a923029248783c60acf7c9597f64 (patch) | |
| tree | eaae6461c41c5ed526cc1a7cb106c6c881cafcb4 /.gitlab | |
| parent | 98f8851f29f940051656caa1715820bce70f8c29 (diff) | |
| parent | 6f17aea066498bf070f0decb3ac0508c6b04e3b8 (diff) | |
| download | pleroma-2168-media-preview-proxy.tar.gz | |
Merge branch 'develop' into 2168-media-preview-proxy2168-media-preview-proxy
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) |