Merge remote-tracking branch 'github/develop' into develop

This commit is contained in:
alisdair sullivan 2015-01-25 21:45:57 -08:00
commit 65a9539851

View file

@ -57,6 +57,7 @@
-ifdef(maps_support).
-type json_value() :: list(json_value())
| list({binary() | atom(), json_value()})
| map()
| true
| false