Merge branch '4.x'

orchestral · Sep 4, 2019 · fca2d8c · fca2d8c
2 parents 3d9791e + a1a6a06
commit fca2d8c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -10,6 +10,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
diff --git a/CHANGELOG.md → CHANGELOG-3.x.md b/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/html`.
 

diff --git a/CHANGELOG-4.x.md b/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/html`.
+
+## 4.0.0
+
+Released: 2019-09-03
+
+### Changes
+
+* Update support for Laravel Framework v6.0.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Laravel    | HTML
  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