diff options
| author | lain <lain@soykaf.club> | 2020-08-26 13:17:39 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-08-26 13:17:39 +0200 |
| commit | fc42446755d5284a2406633358ab8edfa8c0ab0c (patch) | |
| tree | 16924be1f511166b4b1a5d91ce681696ee2a19f1 /.gitlab | |
| parent | 49a436ad3e174e1b0b6442f7a777498cc551449c (diff) | |
| parent | 797535155051e75227fca611c3486c02c01a98b3 (diff) | |
| download | pleroma-fc42446755d5284a2406633358ab8edfa8c0ab0c.tar.gz pleroma-fc42446755d5284a2406633358ab8edfa8c0ab0c.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
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) |