summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-10-03 10:17:33 +0000
committerRémy Coutable <remy@rymai.me>2017-10-03 10:17:33 +0000
commit69b39192fd0186dba2b4c7834eab22ee150d8b88 (patch)
tree83b7c507ae4870d50d99772d2d4a8b732d15f427
parent7cd2b75c376d3c88318c3043136c0160b57710ed (diff)
parentfda5707273d16127cd3a5abb54d69576aa60dd5a (diff)
downloadgitlab-ce-69b39192fd0186dba2b4c7834eab22ee150d8b88.tar.gz
Merge branch 'gitignore-po-timestamp' into 'master'
Git ignore po files ending in time_stamp See merge request gitlab-org/gitlab-ce!14615
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 3baf640a9c3..4933575332b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,4 +63,5 @@ eslint-report.html
/.gitlab_workhorse_secret
/webpack-report/
/locale/**/LC_MESSAGES
+/locale/**/*.time_stamp
/.rspec