Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.json
#	composer.lock
#	src/Filesystem.php
  • Loading branch information
WyriHaximus committed Sep 16, 2019
2 parents 60587f2 + c179039 commit 05f22e9
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github: WyriHaximus

0 comments on commit 05f22e9

Please sign in to comment.