Merge pull request roots#1943 from roots/bs4-beta

Bootstrap 4 Beta, Sage 9.0.0-beta.4
bleepsandblops · Aug 12, 2017 · 79fb1ee · 79fb1ee
2 parents 0a0f1dc d208fa4
commit 79fb1ee
Show file tree

Hide file tree

Showing 9 changed files with 4,890 additions and 681 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 1,6 @@
-### HEAD
 ### 9.0.0-beta.4: August 11th, 2017
 * Update to Bootstrap 4.0.0-beta ([#1943](https://github.com/roots/sage/pull/1943))
 * PHP 7 is now required ([#1935](https://github.com/roots/sage/pull/1935))
 * Update dependencies, support `config-local.json`, implement autoload system for styles/scripts, use `roots/sage-installer`, use `roots/sage-lib` ([#1919](https://github.com/roots/sage/pull/1919))
 * Add soberwp/controller ([#1903](https://github.com/roots/sage/pull/1903))
 * Change syntax of template call to match other files in views ([#1908](https://github.com/roots/sage/pull/1908))

diff --git a/composer.json b/composer.json
@@ -14,6 14,11 @@
  "name": "Scott Walkinshaw",
  "email": "[email protected]",
  "homepage": "https://github.com/swalkinshaw"
  },
  {
  "name": "QWp6t",
  "email": "[email protected]",
  "homepage": "https://github.com/qwp6t"
  }
  ],
  "keywords": ["wordpress"],
@@ -30,12 35,12 @@
  "php": ">=7",
  "composer/installers": "~1.0",
  "illuminate/support": "~5.4",
- "roots/sage-lib": "~9.0.0-beta.3",
  "roots/sage-lib": "~9.0.0-beta.4",
  "soberwp/controller": "dev-master"
  },
  "require-dev": {
  "squizlabs/php_codesniffer": "^2.8.0",
- "roots/sage-installer": "~1.2"
  "roots/sage-installer": "~1.3"
  },
  "scripts": {
  "test": ["phpcs"],

diff --git a/composer.lock b/composer.lock