diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-08-26 16:37:57 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-08-26 16:37:57 -0500 |
| commit | 2cfe2dc81b82f0ab30d82763f2874010966acae6 (patch) | |
| tree | 5797622349e3abd454014ff3a755cb31a55f331f /.gitlab | |
| parent | eead2276e79f29c4d0e10d23eb7524a9ee5f5045 (diff) | |
| parent | 6f17aea066498bf070f0decb3ac0508c6b04e3b8 (diff) | |
| download | pleroma-2cfe2dc81b82f0ab30d82763f2874010966acae6.tar.gz pleroma-2cfe2dc81b82f0ab30d82763f2874010966acae6.zip | |
Merge branch 'develop' into feld-2168-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) |