Skip to content

Commit 54a566f

Browse files
authored
Update README.md
1 parent 911c013 commit 54a566f

File tree

1 file changed

+19
-8
lines changed

1 file changed

+19
-8
lines changed

README.md

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,25 @@ See the "LICENSE" file
4747

4848
# Contributors
4949

50-
* Cheapie (initial idea/project)
51-
* Rubenwardy (lua/ui improvements)
52-
* BuckarooBanzay (cleanups, refactoring)
53-
* Athozus (outbox, maillists, ui fixes)
54-
* fluxionary (minor fixups)
55-
* SX (various fixes)
56-
* Toby1710 (ux fixes)
57-
* Peter Nerlich (cc, bcc)
50+
* Cheapie (Initial idea/project)
51+
* Rubenwardy (Lua/ui improvements)
52+
* BuckarooBanzay (Clean-ups, Refactoring)
53+
* Athozus (Outbox, Maillists, UI, Drafts)
54+
* SX (Various fixes, UI)
55+
* fluxionary (Minor fixups)
56+
* Toby1710 (UX fixes)
57+
* Peter Nerlich (CC, BCC)
58+
* Emojigit (Chinese translation)
59+
* Niklp09 (German translation)
60+
61+
# Git branches
62+
63+
* master : main branch, where are pushed releases and tags
64+
* dev : for new release works, A.B.C release to A.B+1.0
65+
* A.B.X : for fix releases (no new features), A.B.C release to A.B.C+1
66+
67+
For a new fix release (A.B.C) : merge A.B.X branch to master
68+
For a new release (A.B+1.0) : merge dev to master, with previous A.B.C merges (include fixes in master, prioritize dev branch in case of conflicts)
5869

5970
# Old/Historic stuff
6071
* Old forum topic: https://forum.minetest.net/viewtopic.php?t=14464

0 commit comments

Comments
 (0)