]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into...
authorRobin Millette <millette@controlyourself.ca>
Sun, 31 May 2009 21:12:04 +0000 (17:12 -0400)
committerRobin Millette <millette@controlyourself.ca>
Sun, 31 May 2009 21:12:04 +0000 (17:12 -0400)
commitebeb5f744cbfd5bfea0da1b350a3757865ec4b3b
treee94ceadeeba967759cb332211a5adb5d6dceab0b
parent3e0c291810d23bb54c337c0fe95c1ba441459c4c
parent36fe5a85b2de9f71a5c963abd0074dd5b7ae1e61
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into upload

Conflicts:

js/util.js
lib/attachmentlist.php
README
js/util.js
lib/attachmentlist.php
lib/common.php
lib/noticelist.php