Merge remote-tracking branch 'origin/1.0' into 1.1

# Conflicts: # client/dist/styles/bundle.css
silverstripe · Feb 22, 2018 · 8ec56b1 · 8ec56b1
2 parents cb9c61b + 8144244
commit 8ec56b1
Show file tree

Hide file tree

Showing 13 changed files with 149 additions and 175 deletions.
diff --git a/client/dist/fonts/silverstripe.eot b/client/dist/fonts/silverstripe.eot
diff --git a/client/dist/fonts/silverstripe.svg b/client/dist/fonts/silverstripe.svg
diff --git a/client/dist/fonts/silverstripe.ttf b/client/dist/fonts/silverstripe.ttf
diff --git a/client/dist/fonts/silverstripe.woff b/client/dist/fonts/silverstripe.woff
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
diff --git a/client/src/font/fonts/silverstripe.eot b/client/src/font/fonts/silverstripe.eot