[Merge] lp:~phablet-team/history-service/dont-merge-different-chattype into lp:history-service/staging

[Tiago Salem Herrmann]

Tiago Salem Herrmann has proposed merging lp:~phablet-team/history-service/dont-merge-different-chattype into lp:history-service/staging.

Commit message:
- Fix broken tests with latest changes.
- Set ChatType correctly when using createThreadForParticipants()

Requested reviews:
  Gustavo Pichorim Boiko (boiko)

For more details, see:
https://code.launchpad.net/~phablet-team/history-service/dont-merge-different-chattype/+merge/311155

- Fix broken tests with latest changes.
- Set ChatType correctly when using createThreadForParticipants()
-- 
Your team Ubuntu Phablet Team is subscribed to branch lp:history-service/staging.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 504 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20161117/5562f53f/attachment.diff>