Rebecca Law f5de80f195 Fix conflict

2018-11-07 16:39:04 +00:00

..

__init__.py

…

test_rest_history.py

Updated the schema to return reply_to - which is the id and reply_to_text which is the contact_block

2018-02-14 11:20:09 +00:00

test_rest.py

Fix conflict

2018-11-07 16:39:04 +00:00