]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
authorEvan Prodromou <evan@controlyourself.ca>
Thu, 22 Jan 2009 11:35:25 +0000 (12:35 +0100)
committerEvan Prodromou <evan@controlyourself.ca>
Thu, 22 Jan 2009 11:35:25 +0000 (12:35 +0100)
1  2 
actions/avatarsettings.php
actions/showgroup.php
lib/util.php

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