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

This commit is contained in:
alisdair sullivan 2013-10-29 19:49:46 +00:00
commit 4d7c1c5c18
9 changed files with 52 additions and 11 deletions

View file

@ -48,7 +48,7 @@ decoder(Handler, State, Config) ->
Acc::any(),
Stack::list(atom()),
Config::jsx:config()
) -> jsx:decoder().
) -> jsx:decoder() | {incomplete, _}.
resume(Rest, State, Handler, Acc, Stack, Config) ->
case State of
@ -2097,4 +2097,4 @@ custom_incomplete_handler_test_() ->
].
-endif.
-endif.