]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
authorEvan Prodromou <evan@controlyourself.ca>
Mon, 11 May 2009 21:53:23 +0000 (17:53 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Mon, 11 May 2009 21:53:23 +0000 (17:53 -0400)
commit99f8501d321ae9d8087abbe6523e28ce5fd095d3
treefb721b4360f0748df3cb3b522565ad4566422555
parent7f0e57598a5837bbb87f197baa147be29c7df531
parent251fd2c232d96ea09db971a6608231c679395c01
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

Conflicts:
config.php.sample
lib/common.php