summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2017-02-22 17:32:41 +0000
committerRobert Schilling <rschilling@student.tugraz.at>2017-02-22 17:32:41 +0000
commit931db7963ee9fa145d8fe2fb5eea209215227db7 (patch)
treea85ddfcf479ea09237c54a6ce9b0557925f583ff /VERSION
parent0b402e11e355dc8d834fbc139f4bca810a9f766e (diff)
parent33e4294fc884c7bd2a7fb86baf4731daf87db7bb (diff)
downloadgitlab-ce-api-notes-entity-fields.tar.gz
Merge branch 'master' into 'api-notes-entity-fields'api-notes-entity-fields
# Conflicts: # doc/api/v3_to_v4.md
Diffstat (limited to 'VERSION')
-rw-r--r--VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index 5c99c061a47..64de8316674 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.17.0-pre
+8.18.0-pre