pleroma

commit: 797535155051e75227fca611c3486c02c01a98b3
parent: fd04137e182468d519db078d1d309043946652ca
Author: lain <lain@soykaf.club>
Date:   Wed, 26 Aug 2020 05:50:41 +0000

Merge branch 'chore/release-template-merge-back-to-develop' into 'develop'

release MR template: add a note about merging stable changes back to develop

See merge request pleroma/pleroma!2920
Diffstat:
M
.gitlab/merge_request_templates/Release.md
1
+

1 file changed, 1 insertion(+), 0 deletions(-)
diff --git 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)