Merge branch 'master' of http://pi.techtube.pl:3000/krzysiej/paper-pi
Conflicts: .gitignore
This commit is contained in:
23
.gitignore
vendored
23
.gitignore
vendored
@@ -7,3 +7,26 @@
|
|||||||
Homestead.json
|
Homestead.json
|
||||||
Homestead.yaml
|
Homestead.yaml
|
||||||
.env
|
.env
|
||||||
|
|
||||||
|
# ---> Laravel
|
||||||
|
vendor/
|
||||||
|
node_modules/
|
||||||
|
npm-debug.log
|
||||||
|
|
||||||
|
# Laravel 4 specific
|
||||||
|
bootstrap/compiled.php
|
||||||
|
app/storage/
|
||||||
|
|
||||||
|
# Laravel 5 & Lumen specific
|
||||||
|
public/storage
|
||||||
|
public/hot
|
||||||
|
storage/*.key
|
||||||
|
.env.*.php
|
||||||
|
.env.php
|
||||||
|
.env
|
||||||
|
Homestead.yaml
|
||||||
|
Homestead.json
|
||||||
|
|
||||||
|
# Rocketeer PHP task runner and deployment package. https://github.com/rocketeers/rocketeer
|
||||||
|
.rocketeer/
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user