Skip to content
Prev Previous commit
Next Next commit
Merge branch 'v2.0.0' into v2.0.0-beta
# Conflicts:
#	package.json
  • Loading branch information
prescottprue committed Jun 30, 2017
commit 6ed9f111efaaeb4c6d96d16598ce8d2ea72272d4

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.