summaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorAkuket <32392661+Akuket@users.noreply.github.com>2018-10-09 14:49:12 +0200
committerGitHub <noreply@github.com>2018-10-09 14:49:12 +0200
commit28a01862d04654784bd6010035c3a6fe1690ba60 (patch)
treeee52d3c84b12f5ada9a3faf12925dd5806385a91 /README.md
parent3b4f285fea4a90ee96bfce855e1539adcec9b7aa (diff)
parent58855ada97677d25475ba4721834c0f576ed3b47 (diff)
downloadwekan-28a01862d04654784bd6010035c3a6fe1690ba60.tar.gz
wekan-28a01862d04654784bd6010035c3a6fe1690ba60.tar.bz2
wekan-28a01862d04654784bd6010035c3a6fe1690ba60.zip
Merge branch 'edge' into edge
Diffstat (limited to 'README.md')
-rw-r--r--README.md11
1 files changed, 11 insertions, 0 deletions
diff --git a/README.md b/README.md
index a57a144c..54804197 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,16 @@
# 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.
+- If you want automatic updates, [use Snap](https://github.com/wekan/wekan-snap/wiki/Install).
+- If you want to test before update, [use Docker quay.io release tags](https://github.com/wekan/wekan/wiki/Docker).
+
+## 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]