summaryrefslogtreecommitdiff
path: root/.editorconfig
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-08 18:08:48 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-08 18:08:48 +0000
commitea8492330b51c502b005e60e3a5ff84ec4eea467 (patch)
tree4494b72bfe6b804d79e87aecf9add94b13025845 /.editorconfig
parentdc47d7f5c0f1a402463e9c1adaffecf3f465bc7f (diff)
downloadgitlab-ce-ea8492330b51c502b005e60e3a5ff84ec4eea467.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.editorconfig')
-rw-r--r--.editorconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/.editorconfig b/.editorconfig
index 56ce6d87145..932acffe9fc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,5 +14,5 @@ indent_size = 2
indent_style = space
charset = utf-8
-[*.{md,markdown}]
+[*.{md,markdown,js.snap}]
trim_trailing_whitespace = false