Jocelyn Fiat
40e524337e
Merge branch 'master' of https://github.com/eiffelhub/json
Conflicts:
draft/library/gobo/shared_gobo_ejson.e
draft/library/kernel/converters/json_converter.e
draft/library/kernel/converters/json_hash_table_converter.e
draft/library/kernel/converters/json_linked_list_converter.e
draft/library/kernel/ejson.e
draft/library/kernel/shared_ejson.e
draft/test/autotest/test_suite/json_author_converter.e
draft/test/autotest/test_suite/json_book_collection_converter.e
draft/test/autotest/test_suite/json_book_converter.e
draft/test/autotest/test_suite/test_json_core.e