]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' into 1.0.x
authorBrion Vibber <brion@pobox.com>
Thu, 16 Dec 2010 23:56:19 +0000 (15:56 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 16 Dec 2010 23:56:19 +0000 (15:56 -0800)
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po

1  2 
lib/router.php
plugins/OStatus/classes/Ostatus_profile.php

diff --cc lib/router.php
Simple merge