Merge remote-tracking branch 'refs/remotes/origin/developement'
# Conflicts: # .gitignore
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -12,4 +12,4 @@ Homestead.json
|
|||||||
/public/photos/
|
/public/photos/
|
||||||
/app/FaveoJob
|
/app/FaveoJob
|
||||||
/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php
|
/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php
|
||||||
/storage/app/attachments
|
/storage/app/attachments
|
||||||
|
Reference in New Issue
Block a user