Merge branch 'develop'

This commit is contained in:
alisdair sullivan 2015-06-11 19:56:40 -07:00
commit 46f246dc3a
6 changed files with 16 additions and 7 deletions

View file

@ -1,7 +1,7 @@
{application, jsx,
[
{description, "a streaming, evented json parsing toolkit"},
{vsn, "2.6.0"},
{vsn, "2.6.2"},
{modules, [
jsx,
jsx_encoder,