summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn T Skarbek <jskarbek@gitlab.com>2020-11-02 14:04:38 -0500
committerJohn T Skarbek <jskarbek@gitlab.com>2020-11-02 14:04:38 -0500
commiteed6bb83bee305fc420ee81e5ac1af028ce3be68 (patch)
tree9b27587dc89c61d66e45907144d8dbc02e19fe64
parentb8110282a17d805dc28fb94f2d62f164bd1c3665 (diff)
parent257473eac0d0360a88e9677e4b56fd100bfba8df (diff)
downloadgitlab-ce-eed6bb83bee305fc420ee81e5ac1af028ce3be68.tar.gz
Merge remote-tracking branch 'dev/13-4-stable' into 13-4-stable
-rw-r--r--VERSION2
-rwxr-xr-x[-rw-r--r--]vendor/gitignore/C++.gitignore0
-rwxr-xr-x[-rw-r--r--]vendor/gitignore/Java.gitignore0
3 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index 24a9ec7aa95..2150631c08c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.4.4 \ No newline at end of file
+13.4.5 \ No newline at end of file
diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore
index 259148fa18f..259148fa18f 100644..100755
--- a/vendor/gitignore/C++.gitignore
+++ b/vendor/gitignore/C++.gitignore
diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore
index a1c2a238a96..a1c2a238a96 100644..100755
--- a/vendor/gitignore/Java.gitignore
+++ b/vendor/gitignore/Java.gitignore