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

# Conflicts: # client/dist/js/bundle.js # client/dist/js/i18n.js # client/dist/styles/bundle.css # client/src/i18n.js
silverstripe · Mar 13, 2018 · 4166209 · 4166209
2 parents b01b5bb + 9722988
commit 4166209
Show file tree

Hide file tree

Showing 6 changed files with 240 additions and 228 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/dist/js/i18n.js b/client/dist/js/i18n.js
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css