summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-10-03 21:34:18 +0300
committerLauri Ojansivu <x@xet7.org>2018-10-03 21:34:18 +0300
commit525a6defd9ab2390d0ea14090d66b360616cd238 (patch)
tree0303247d4b1cdf05dc8f7e07de7c844ad7b01bbb
parent1623ef65bb49cd0a3e5cb11145ded68f2c11d2fb (diff)
parent22077af137b50e8203ca1105bf22f72b4d17d1f8 (diff)
downloadwekan-1.53.tar.gz
wekan-1.53.tar.bz2
wekan-1.53.zip
Merge branch 'devel' of github.com:wekan/wekan into develv1.53
-rw-r--r--README.md9
1 files changed, 9 insertions, 0 deletions
diff --git a/README.md b/README.md
index a57a144c..5fd6dc70 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,14 @@
# Wekan
+## Stable
+
+- master+devel branch. At release, devel is merged to master.
+- Receives fixes and features that have been tested at edge that they work.
+
+## Edge
+
+- edge branch. All new fixes and features are added to here first. [Testing Edge](https://github.com/wekan/wekan-snap/wiki/Snap-Developer-Docs).
+
[![Translate Wekan at Transifex](https://img.shields.io/badge/Translate%20Wekan-at%20Transifex-brightgreen.svg "Freenode IRC")](https://transifex.com/wekan/wekan)
[![Wekan Vanila Chat][vanila_badge]][vanila_chat]