]> 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: bd05621 65bfda3)
Merge branch 'master' into groups
authorEvan Prodromou <evan@controlyourself.ca>
Wed, 21 Jan 2009 04:13:02 +0000 (23:13 -0500)
committerEvan Prodromou <evan@controlyourself.ca>
Wed, 21 Jan 2009 04:13:02 +0000 (23:13 -0500)
Conflicts:

.gitignore


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