Skip to content

Commit 60a734a

Browse files
committed
Merge remote-tracking branch 'ibn/release-v7' into release-v7
2 parents 6a0dbc3 + da5d945 commit 60a734a

15 files changed

+36135
-581
lines changed

Diff for: .gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11

22
.env
3+
.env.barryo
34
.env*.local
45
.env.by-vagrant.*
6+
/*.rrd
57
.project
68
.buildpath
79
.settings/
@@ -33,6 +35,8 @@ storage/grapher/
3335
storage/files/*
3436
storage/tmp/*
3537

38+
tests/Browser/ExampleTest.php
39+
3640
tools/perl-lib/IXPManager/MYMETA.yml
3741
tools/perl-lib/IXPManager/Makefile
3842
tools/perl-lib/IXPManager/blib/

Diff for: .idea/laravel-idea-personal.xml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: .phpstorm.meta.php/laravel.meta.php

+72-86
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)