]> 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: 5152d31 13976f5)
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x
authorEvan Prodromou <evan@status.net>
Wed, 23 Sep 2009 17:51:41 +0000 (13:51 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 23 Sep 2009 17:51:41 +0000 (13:51 -0400)
Conflicts:
plugins/Realtime/realtimeupdate.js


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. :-)