Permalink
Browse files

Merge pull request #3989 from pyrocms/3.1

3.1
  • Loading branch information...
2 parents eeccbbc + 46d55ff commit a057e0dda0d5fceebc7f4e0d434024198e8cc4c8 @RyanThompson RyanThompson committed on GitHub Dec 2, 2016
Showing with 13 additions and 1 deletion.
  1. +1 −0 .gitignore
  2. +1 −1 CONTRIBUTING.md
  3. +11 −0 config/streams.php
View
@@ -7,3 +7,4 @@ composer.lock
/vendor
/coverage
/node_modules
+/bower_components
View
@@ -29,7 +29,7 @@ If you are unsure if your feature qualifies as a major or minor, please ask Tayl
## Security Vulnerabilities
-If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell at taylor@laravel.com. All security vulnerabilities will be promptly addressed.
+If you discover a security vulnerability within Laravel, please send an e-mail to Ryan Thompson at ryan@pyrocms.com. All security vulnerabilities will be promptly addressed.
## Coding Style
View
@@ -107,5 +107,16 @@
*/
'middleware_priority' => [],
+
+ /*
+ |--------------------------------------------------------------------------
+ | View Overrides
+ |--------------------------------------------------------------------------
+ |
+ | Define globally overriden views as 'view' => 'override' view paths.
+ |
+ */
+
+ 'overrides' => [],
];

0 comments on commit a057e0d

Please sign in to comment.