]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '1.0.x' into schema-x
authorBrion Vibber <brion@pobox.com>
Mon, 25 Oct 2010 20:14:33 +0000 (13:14 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 25 Oct 2010 20:14:33 +0000 (13:14 -0700)
commitb483a0549f115b2d5f2cfb3d447e6cc5c4f469f3
treef63f4f3e93bad7611f4b5651171fc5122ec65455
parent3b6f738ab73b7f77dd09ac21dd9446876776fc04
parentca489631db840e33757a71a7e4cb56b187c182d3
Merge branch '1.0.x' into schema-x

Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
classes/statusnet.ini
lib/common.php