Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-08-15 15:44:51 +0300
committerJarka Kadlecova <jarka@gitlab.com>2017-08-16 18:22:30 +0300
commit802a0ecf87df12796d2e92b63d8c87b38aff0d5d (patch)
tree0091aa05faa738d95f9836d05c55917ee178acf2 /app
parent970d9e96f26928286f18f685b8409ab44d9651bf (diff)
Merge branch 'zj-add-two-more-project-templates' into 'master'
Add two more project templates See merge request !13415
Diffstat (limited to 'app')
-rw-r--r--app/views/shared/icons/_express.svg (renamed from app/views/shared/icons/_node_express.svg)0
-rw-r--r--app/views/shared/icons/_spring.svg (renamed from app/views/shared/icons/_java_spring.svg)0
2 files changed, 0 insertions, 0 deletions
diff --git a/app/views/shared/icons/_node_express.svg b/app/views/shared/icons/_express.svg
index f2c94319f19..f2c94319f19 100644
--- a/app/views/shared/icons/_node_express.svg
+++ b/app/views/shared/icons/_express.svg
diff --git a/app/views/shared/icons/_java_spring.svg b/app/views/shared/icons/_spring.svg
index 508349aa456..508349aa456 100644
--- a/app/views/shared/icons/_java_spring.svg
+++ b/app/views/shared/icons/_spring.svg