]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.8.x' into userdesign
authorZach Copley <zach@controlyourself.ca>
Wed, 17 Jun 2009 21:40:52 +0000 (21:40 +0000)
committerZach Copley <zach@controlyourself.ca>
Wed, 17 Jun 2009 21:40:52 +0000 (21:40 +0000)
1  2 
lib/common.php
theme/base/css/display.css

diff --cc lib/common.php
Simple merge
Simple merge