Timestamp:
2015-04-06T02:26:44Z (10 years ago)
Author:
dequis <dx@…>
Children:
d16e951
Parents:
71f87ba (diff), 69982f8 (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.
git-author:
dequis <dx@…> (06-04-15 02:24:35)
git-committer:
dequis <dx@…> (06-04-15 02:26:44)
Message:

Merge branch 'develop' into feat/hip-cat

Conflicts:

irc_im.c
protocols/jabber/conference.c

(No files)

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