Skip to content

Commit

Permalink
Merge branch 'release-2.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Rothuis committed Dec 13, 2016
2 parents eebc000 + fc36d03 commit 509c4c2
Showing 1 changed file with 28 additions and 19 deletions.
47 changes: 28 additions & 19 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 509c4c2

Please sign in to comment.