]> 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: 9ae3d3d 70cf37c)
Merge branch 'testing' into pluginstatic
authorEvan Prodromou <evan@status.net>
Thu, 3 Feb 2011 16:42:58 +0000 (11:42 -0500)
committerEvan Prodromou <evan@status.net>
Thu, 3 Feb 2011 16:42:58 +0000 (11:42 -0500)
1  2 
plugins/NewMenu/NewMenuPlugin.php patch | diff1 | diff2 | blob | history

diff --cc plugins/NewMenu/NewMenuPlugin.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. :-)