]> 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: c2d7a08 1f4b63d)
Merge remote branch 'gitorious/testing' into testing
authorEvan Prodromou <evan@status.net>
Mon, 24 Jan 2011 13:54:09 +0000 (06:54 -0700)
committerEvan Prodromou <evan@status.net>
Mon, 24 Jan 2011 13:54:09 +0000 (06:54 -0700)
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. :-)