]> 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: 783d292 e738149)
Merge branch '0.7.x' of git@gitorious.org:laconica/dev
authorEvan Prodromou <evan@controlyourself.ca>
Wed, 1 Apr 2009 18:40:58 +0000 (14:40 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Wed, 1 Apr 2009 18:40:58 +0000 (14:40 -0400)
Conflicts:
README
lib/router.php

1  2 
lib/util.php patch | diff1 | diff2 | blob | history

diff --cc lib/util.php
Simple 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. :-)