]> 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: cf1a4d8 b54a9f3)
Merge branch 'microapp' of gitorious.org:~evan/statusnet/evans-mainline into microapp
authorEvan Prodromou <evan@status.net>
Mon, 7 Mar 2011 10:02:26 +0000 (05:02 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 7 Mar 2011 10:02:26 +0000 (05:02 -0500)
Conflicts:
lib/action.php


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