diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-26 00:45:03 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-10-26 00:45:03 +0000 |
| commit | 0efbc126d080892214d312a3ae2549f1fc341cb6 (patch) | |
| tree | b7131288bcbc3c5b0160ad55ed4b95523ce71c12 /VERSION | |
| parent | 46e3ad4b948dedf67245708493ee17c4429f8bf3 (diff) | |
| parent | 679c0048a8f679aad456c02e30486150bbd0d93d (diff) | |
| download | gitlab-ce-0efbc126d080892214d312a3ae2549f1fc341cb6.tar.gz | |
Merge branch 'master' into 'prettify-all-the-things-4'prettify-all-the-things-4
# Conflicts:
# app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
Diffstat (limited to 'VERSION')
| -rw-r--r-- | VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -11.4.0-pre +11.5.0-pre |