X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=.gitlab%2Fmerge_request_templates%2FRelease.md;h=b2c772696f6ef77b58d5d7c9254b121d042c53dc;hb=f3bc076f09dc6df97e3b4ff1704b41e68040354f;hp=237f74e00c1e5223e774fa90da965c3a3f344d3d;hpb=a2a8c8e9e09b3aa5bc488a958a0afe5909a6e89c;p=akkoma

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)