]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b2abf0 a3fea6f)
Merge branch 'idle-irc-plugin' into irc-plugin
authorLuke Fitzgerald <lw.fitzgerald@googlemail.com>
Thu, 12 Aug 2010 19:00:42 +0000 (12:00 -0700)
committerLuke Fitzgerald <lw.fitzgerald@googlemail.com>
Thu, 12 Aug 2010 19:01:11 +0000 (12:01 -0700)
Conflicts:
plugins/Irc/ircmanager.php


Trivial merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)