Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
bsweeney committed Feb 16, 2017
2 parents 875eade + d090f5e commit 0f418c6
Show file tree
Hide file tree
Showing 69 changed files with 5,837 additions and 4,052 deletions.
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -29,7 +29,7 @@
"ext-gd": "*",
"ext-dom": "*",
"ext-mbstring": "*",
"phenx/php-font-lib": "0.4.*",
"phenx/php-font-lib": "0.5.*",
"phenx/php-svg-lib": "0.2.*"
},
"require-dev": {
Expand Down

0 comments on commit 0f418c6

Please sign in to comment.