summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-08 21:08:08 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-08 21:08:08 +0000
commite0b84f4ba4b44c8ecf00be97843c40df2550b74c (patch)
tree7cecae4276358dd46d7fa15f84068f7b4c626089 /.gitignore
parent73391dcc368ef846c2960c1d0ef5e64ca78e1bee (diff)
downloadgitlab-ce-e0b84f4ba4b44c8ecf00be97843c40df2550b74c.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 7e038bff3b3..0513bcf19cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,4 +86,4 @@ jsdoc/
.projections.json
/qa/.rakeTasks
webpack-dev-server.json
-.nvimrc
+/.nvimrc