]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
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)
commit648d967226f3b47aa6237d2be9d1a82df4f78402
tree2592f56f0073ee21ce320a158233fdb1bd2710c4
parent6335c9cf59b384da24506c4a3f799315fbbc4b09
parent0b53a820c2b4224b66b2a24f67302b4c5ca1deed
Merge branch '0.8.x' into userdesign

Conflicts:
lib/attachmentlist.php
lib/noticelist.php
lib/attachmentlist.php
lib/noticelist.php