]> 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: 5b7b38a 482faf6)
Merge branch 'master' into 0.9.x
authorEvan Prodromou <evan@status.net>
Sun, 28 Mar 2010 19:25:02 +0000 (15:25 -0400)
committerEvan Prodromou <evan@status.net>
Sun, 28 Mar 2010 19:25:02 +0000 (15:25 -0400)
Conflicts:
lib/attachmentlist.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. :-)