]> 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>
Tue, 19 May 2009 18:42:19 +0000 (14:42 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Tue, 19 May 2009 18:42:19 +0000 (14:42 -0400)
commit8cc8f9fd0c0ad8d1c38bd0c113f9f0a4d7918256
tree9ff8e6cecfcd1539a2d6772133cd99e7706d94fc
parent99f8501d321ae9d8087abbe6523e28ce5fd095d3
parent09e95cc33fb2228066d524e399bcc549e85eb565
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

Conflicts:
config.php.sample