]> 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: 84984fd 074be0d)
Merge branch '1.0.x' into limitdist2
authorEvan Prodromou <evan@status.net>
Fri, 25 Mar 2011 19:57:07 +0000 (15:57 -0400)
committerEvan Prodromou <evan@status.net>
Fri, 25 Mar 2011 19:57:07 +0000 (15:57 -0400)
Conflicts:
lib/groupnoticestream.php
lib/taggedprofilenoticestream.php

1  2 
lib/profilenoticestream.php patch | diff1 | diff2 | blob | history

diff --cc lib/profilenoticestream.php
Simple 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. :-)