diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-01-11 14:38:37 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-01-11 14:38:37 +0000 |
| commit | 4a463039ea9760efcdb7fa3ddb2b9723c704a53a (patch) | |
| tree | a98b044349fa4a0b65999311a86e14b706526e43 /vendor/gitignore/Global/Emacs.gitignore | |
| parent | 4404ea8662508c60f96e6730d9a45feb68498c28 (diff) | |
| parent | 930dd639fb7690246ba29d88aa94a75fe9fd8f2a (diff) | |
| download | gitlab-ce-4a463039ea9760efcdb7fa3ddb2b9723c704a53a.tar.gz | |
Merge branch 'update-templates-8-16' into 'master'
Update templates - 8.16 RC1
See merge request !8505
Diffstat (limited to 'vendor/gitignore/Global/Emacs.gitignore')
| -rw-r--r-- | vendor/gitignore/Global/Emacs.gitignore | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vendor/gitignore/Global/Emacs.gitignore b/vendor/gitignore/Global/Emacs.gitignore index 0c96c9ad060..3ac7904dcd2 100644 --- a/vendor/gitignore/Global/Emacs.gitignore +++ b/vendor/gitignore/Global/Emacs.gitignore @@ -39,4 +39,7 @@ flycheck_*.el /server/ # projectiles files -.projectile
\ No newline at end of file +.projectile + +# directory configuration +.dir-locals.el |