summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2011-03-10 12:35:56 +0100
committerChristoph Helma <helma@in-silico.ch>2011-03-10 12:35:56 +0100
commit02c7ed8ed11323d47b49dd46ee02f765c0bc1118 (patch)
tree917c6072c29fd28cb458c8c809b17d8a50e16635 /config
parent1c53e3aa29870149a5d86559fc37d98fcaaec3fb (diff)
parent4caea3b8acb048d96739f5a4307c29efb5269e1c (diff)
Merge branch 'release/v1.0.0'v1.0.0
Diffstat (limited to 'config')
-rw-r--r--config7
1 files changed, 4 insertions, 3 deletions
diff --git a/config b/config
index 272b132..b5dabcc 100644
--- a/config
+++ b/config
@@ -17,6 +17,7 @@ mysql_root=opentox
install=server
# Git branch of services
-# Options: master test development
-# "master" is the current stable version
-branch=development
+# Options: master development
+# "master" installs the current stable version
+branch=master
+