]> 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: cd3a53e 2ea17b0)
Merge branch '1.0.x' into activity
authorEvan Prodromou <evan@status.net>
Tue, 23 Aug 2011 04:41:03 +0000 (00:41 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 23 Aug 2011 04:41:03 +0000 (00:41 -0400)
1  2 
classes/Notice.php patch | diff1 | diff2 | blob | history

diff --cc classes/Notice.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. :-)