Commit 6da617f8 authored by David Haynes's avatar David Haynes 🙆

Merge branch 'master' into 4.0-stable

parents 5bba2fd6 23b97ae5
......@@ -15,6 +15,8 @@ build:
- build/js
- build/css
- build/fonts
only:
- master
pages:
stage: deploy
......@@ -25,3 +27,5 @@ pages:
artifacts:
paths:
- public
only:
- master
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment