Merge branch '5.5' into 5.6

laravel · Feb 7, 2018 · 0892733 · 0892733
2 parents 427effa + 6a64c8d
commit 0892733
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG-5.5.md b/CHANGELOG-5.5.md
@@ -1,6 +1,6 @@
 # Release Notes for 5.5.x
 
-## [Unreleased]
+## v5.5.34 (2018-02-06)
 
 ### Changed
 - Use path helpers in console commands ([#22971](https://github.com/laravel/framework/pull/22971))

diff --git a/src/Illuminate/Filesystem/FilesystemManager.php b/src/Illuminate/Filesystem/FilesystemManager.php
@@ -252,7 +252,7 @@ protected function getRackspaceContainer(Rackspace $client, array $config)
      *
      * @param  \League\Flysystem\AdapterInterface  $adapter
      * @param  array  $config
-     * @return \League\Flysystem\FlysystemInterface
+     * @return \League\Flysystem\FilesystemInterface
      */
     protected function createFlysystem(AdapterInterface $adapter, array $config)
     {