Changeset 51b14b8 for protocols/jabber

Timestamp:
2015-05-28T17:46:47Z (9 years ago)
Author:
dequis <dx@…>
Children:
c720890
Parents:
d2d2b80 (diff), bef322e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'develop' into feat/hip-cat

(No files)

Note: See TracChangeset for help on using the changeset viewer.