Merge branch 'master' into develop

.gitignore

@@ -4,6 +4,7 @@
 /storage/*.key
 /vendor
 /.idea
+/.vscode
 /.vagrant
 Homestead.json
 Homestead.yaml

CHANGELOG.md

@@ -1,5 +1,39 @@
 # Release Notes
 
+## [Unreleased]
+
+### Changed
+- Updated Mix to 2.0 ([#4557](https://github.com/laravel/laravel/pull/4557))
+
+
+## v5.5.28 (2018-01-03)
+
+### Added
+- Added `symfony/thanks` ([60de3a5](https://github.com/laravel/laravel/commit/60de3a5670c4a3bf5fb96433828b6aadd7df0e53))
+
+### Changed
+- Reduced hash computations during tests ([#4517](https://github.com/laravel/laravel/pull/4517), [4bfb164](https://github.com/laravel/laravel/commit/4bfb164c26e4e15ec367912100a71b8fe1500b5c))
+- Use environment variables for SQS config ([#4516](https://github.com/laravel/laravel/pull/4516), [aa4b023](https://github.com/laravel/laravel/commit/aa4b02358a018ebc35123caeb92dcca0669e2816))
+- Use hard-coded password hash ([f693a20](https://github.com/laravel/laravel/commit/f693a20a3ce6d2461ca75490d44cd1b6ba09ee84))
+- Updated default Echo configuration for Pusher ([#4525](https://github.com/laravel/laravel/pull/4525), [aad5940](https://github.com/laravel/laravel/commit/aad59400e2d69727224a3ca9b6aa9f9d7c87e9f7), [#4526](https://github.com/laravel/laravel/pull/4526), [a32af97](https://github.com/laravel/laravel/commit/a32af97ede49fdd57e8217a9fd484b4cb4ab1bbf))
+
+
+## v5.5.22 (2017-11-21)
+
+### Added
+- Added `-Indexes` option in `.htaccess` ([#4422](https://github.com/laravel/laravel/pull/4422))
+
+### Changed
+- Load session lifetime from env file ([#4444](https://github.com/laravel/laravel/pull/4444))
+- Update mockery to 1.0 ([#4458](https://github.com/laravel/laravel/pull/4458))
+- Generate cache prefix from `APP_NAME` ([#4409](https://github.com/laravel/laravel/pull/4409))
+- Match AWS environment variable name with AWS defaults ([#4470](https://github.com/laravel/laravel/pull/4470))
+- Don't show progress for `production` command ([#4467](https://github.com/laravel/laravel/pull/4467))
+
+### Fixed
+- Fixed directive order in `.htaccess` ([#4433](https://github.com/laravel/laravel/pull/4433))
+
+
 ## v5.5.0 (2017-08-30)
 
 ### Added

package.json

@@ -15,7 +15,7 @@
         "popper.js": "^1.12",
         "cross-env": "^5.1",
         "jquery": "^3.2",
-        "laravel-mix": "^1.0",
+        "laravel-mix": "^2.0",
         "lodash": "^4.17.4",
         "vue": "^2.5.7"
     }

readme.md

@@ -33,6 +33,7 @@ ## Laravel Sponsors
 
 - **[Vehikl](https://vehikl.com/)**
 - **[Tighten Co.](https://tighten.co)**
+- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)**
 - **[British Software Development](https://www.britishsoftware.co)**
 - [Fragrantica](https://www.fragrantica.com)
 - [SOFTonSOFA](https://softonsofa.com/)