Merge branch 'winh-templates-10-2' into 'master'

Update templates for 10.2

See merge request gitlab-org/gitlab-ce!15317
This commit is contained in:
Oswaldo Ferreira 2017-11-10 15:28:03 +00:00
commit 913c0bf522
3 changed files with 3 additions and 3 deletions

View file

@ -32,7 +32,7 @@ proguard/
# Android Studio captures folder
captures/
# Intellij
# IntelliJ
*.iml
.idea/workspace.xml
.idea/tasks.xml

View file

@ -24,7 +24,7 @@ Build.bat
# Module::Install
inc/
# ExtUitls::MakeMaker
# ExtUtils::MakeMaker
/blib/
/_eumm/
/*.gz

View file

@ -16,7 +16,7 @@ image: "crystallang/crystal:latest"
# Cache shards in between builds
cache:
paths:
- libs
- lib
# This is a basic example for a shard or script which doesn't use
# services such as redis or postgres