Changeset 356e2dd for protocols/jabber

Timestamp:
2015-04-21T04:04:57Z (10 years ago)
Author:
dequis <dx@…>
Children:
b8c336b
Parents:
291c49b (diff), 71074ac (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.