Changeset fc650a8 for protocols/jabber

Timestamp:
2015-03-15T09:29:01Z (10 years ago)
Author:
dequis <dx@…>
Children:
c0e4c22
Parents:
89db90e (diff), 2dd23da (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.