]> 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: ea14cc7 f726c6b)
Merge remote-tracking branch 'origin/1.1.x' into 1.1.x
authorEvan Prodromou <evan@status.net>
Sat, 2 Mar 2013 16:28:20 +0000 (11:28 -0500)
committerEvan Prodromou <evan@status.net>
Sat, 2 Mar 2013 16:28:20 +0000 (11:28 -0500)

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