]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
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)
commite79034e163967a375aee8a9afff54fd9c37030dd
treedaa48934b25ea7e4f399d59981c9534e7e43fbcc
parentbf20258f4b61dd8396db9a1980463c060dab292c
parentf901c25012f6c83f70c83bff9e76edb4d01b8373
Merge branch '0.9.x' into 1.0.x

Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
lib/router.php
plugins/OStatus/classes/Ostatus_profile.php