]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bafa1ab) | patch
Fix conflict from merge with 0.7.x; remove conflict markers
authorZach Copley <zach@controlyourself.ca>
Fri, 10 Jul 2009 21:44:50 +0000 (14:44 -0700)
committerZach Copley <zach@controlyourself.ca>
Fri, 10 Jul 2009 21:44:50 +0000 (14:44 -0700)
commit111aee9dc033256189a34800a7a6e11fa87aa041
treeec655abe325591dacd5dc9f2a66c965f1fb42967tree | snapshot
parentbafa1ab1c532118e2230df50ed18a1b4573692b7commit | diff
Fix conflict from merge with 0.7.x; remove conflict markers
README diff | blob | history
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)