diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-08-23 11:31:17 +0200 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-08-23 11:31:17 +0200 |
commit | fbe82e4cd9f4cda7264bb78eab9c5c55e6311518 (patch) | |
tree | de9444c1762fa43c336f595936878677aef8ce43 /GITALY_SERVER_VERSION | |
parent | 64820f9a6c17a348dc771a87618140a5c3c8874d (diff) | |
parent | 101d52b360a6a43f1633c5dd60b78e37bc8c4339 (diff) | |
download | gitlab-ce-fbe82e4cd9f4cda7264bb78eab9c5c55e6311518.tar.gz |
Merge branch 'master' into issue-discussions-refactor
# Conflicts:
# package.json
Diffstat (limited to 'GITALY_SERVER_VERSION')
-rw-r--r-- | GITALY_SERVER_VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index c25c8e5b741..be386c9ede3 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -0.30.0 +0.33.0 |