Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
jackjamieson2 committed Dec 2, 2019
2 parents 7fc63e9 + c43c0fe commit c098e71
Show file tree
Hide file tree
Showing 12 changed files with 994 additions and 217 deletions.
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
"vendor/parse-this" : ["dshanske/parse-this"]
},
"copy-file" : {
"vendor/parse-this/parse-this.php": "lib/parse-this/",
"vendor/parse-this/readme.txt": "lib/parse-this/",
"vendor/parse-this/readme.md": "lib/parse-this/",
"vendor/parse-this/includes/": "lib/parse-this/includes/",
"vendor/parse-this/lib/": "lib/parse-this/lib/"
"vendor/dshanske/parse-this/parse-this.php": "lib/parse-this/",
"vendor/dshanske/parse-this/readme.txt": "lib/parse-this/",
"vendor/dshanske/parse-this/readme.md": "lib/parse-this/",
"vendor/dshanske/parse-this/includes/": "lib/parse-this/includes/",
"vendor/dshanske/parse-this/lib/": "lib/parse-this/lib/"
}
},
"require": {
Expand Down
Loading

0 comments on commit c098e71

Please sign in to comment.