]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7e38142) | patch
Resolve conflict properly
authorMike Cochrane <mikec@mikenz.geek.nz>
Thu, 10 Jul 2008 04:59:42 +0000 (00:59 -0400)
committerMike Cochrane <mikec@mikenz.geek.nz>
Thu, 10 Jul 2008 04:59:42 +0000 (00:59 -0400)
commit98cf96b3e4f642158a13d12d248170367332cce9
tree4ace79ebdb07a7f86688c4847b727880535fc04ftree | snapshot
parent7e38142d4aa080767617724a98c0cf60c70961d0commit | diff
Resolve conflict properly

darcs-hash:20080710045942-533db-209fce2e2e89dfc809c9b25e93fb428c585f29e4.gz
classes/Reply.php 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. :-)