Skip to content

Commit

Permalink
Merge branch '4.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
crynobone committed Sep 1, 2019
2 parents 95ce380 + 514ae5e commit c1eb29d
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Expand Up @@ -9,6 +9,6 @@
/.scrutinizer.yml export-ignore
/.travis.yml export-ignore
/phpunit.xml export-ignore
/CHANGELOG.md export-ignore
/CHANGELOG-*.md export-ignore
/LICENSE export-ignore
/README.md export-ignore
2 changes: 1 addition & 1 deletion CHANGELOG.md → CHANGELOG-3.x.md
@@ -1,4 +1,4 @@
# Changelog
# Changelog for 3.x

This changelog references the relevant changes (bug and security fixes) done to `orchestra/view`.

Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG-4.x.md
@@ -0,0 +1,11 @@
# Changelog for 4.x

This changelog references the relevant changes (bug and security fixes) done to `orchestra/view`.

### 4.0.0

Released: 2019-09-01

### Changes

* Update support for Laravel Framework v6.0.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -27,7 +27,7 @@ Laravel | View
5.6.x | 3.6.x
5.7.x | 3.7.x
5.8.x | 3.8.x
6.x | 4.x@dev
6.x | 4.x

## Installation

Expand Down
14 changes: 0 additions & 14 deletions src/FileViewFinder.php
Expand Up @@ -23,18 +23,4 @@ protected function findNamespacedView($name)
return "{$path}/packages/{$namespace}";
})->merge($this->hints[$namespace])->all());
}

/**
* Set the active view paths.
*
* @param array $paths
*
* @return $this
*/
public function setPaths($paths)
{
$this->paths = $paths;

return $this;
}
}

0 comments on commit c1eb29d

Please sign in to comment.