]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.8.x' into userdesign
authorEvan Prodromou <evan@controlyourself.ca>
Wed, 27 May 2009 03:24:01 +0000 (23:24 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Wed, 27 May 2009 03:24:01 +0000 (23:24 -0400)
Conflicts:
lib/attachmentlist.php
lib/noticelist.php

1  2 
lib/attachmentlist.php
lib/noticelist.php

Simple merge
Simple merge