Merge branch 'update-templates-11-4' into 'master'

Update templates for 11.4

See merge request gitlab-org/gitlab-ce!22188
This commit is contained in:
Kamil Trzciński 2018-10-08 10:55:57 +00:00
commit e8f4bfd114
4 changed files with 14 additions and 3 deletions

View File

@ -61,3 +61,6 @@ fabric.properties
# Editor-based Rest Client
.idea/httpRequests
# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

View File

@ -20,7 +20,7 @@ coverage
# nyc test coverage
.nyc_output
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt
# Bower dependency directory (https://bower.io/)

View File

@ -64,6 +64,9 @@ acs-*.bib
# changes
*.soc
# comment
*.cut
# cprotect
*.cpt
@ -205,6 +208,9 @@ pythontex-files-*/
# easy-todo
*.lod
# xcolor
*.xcp
# xmpincl
*.xmpi

View File

@ -4,6 +4,7 @@
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
# User-specific files
*.rsuser
*.suo
*.user
*.userosscache
@ -76,6 +77,7 @@ StyleCopReport.xml
*.tlh
*.tmp
*.tmp_proj
*_wpftmp.csproj
*.log
*.vspscc
*.vssscc
@ -290,8 +292,8 @@ paket-files/
.idea/
*.sln.iml
# CodeRush
.cr/
# CodeRush personal settings
.cr/personal
# Python Tools for Visual Studio (PTVS)
__pycache__/