git.mxchange.org Git - quix0rs-gnu-social.git/commit - plugins/BlogspamNet/locale/zh_CN/LC_MESSAGES/BlogspamNet.po

]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - plugins/BlogspamNet/locale/zh_CN/LC_MESSAGES/BlogspamNet.po

projects / quix0rs-gnu-social.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b483a05 b26eccf)

author	Brion Vibber <brion@pobox.com>
	Thu, 28 Oct 2010 23:27:53 +0000 (16:27 -0700)
committer	Brion Vibber <brion@pobox.com>
	Thu, 28 Oct 2010 23:27:53 +0000 (16:27 -0700)
commit	e7c7fd39fc948f1169512916077185dd29973b60
tree	6fe8c025a308d423c87444a5daa5da1d02d62182	tree \| snapshot
parent	b483a0549f115b2d5f2cfb3d447e6cc5c4f469f3	commit \| diff
parent	b26eccf33cf69c04a96d5d6d3eddc0ef68ffd4b1	commit \| diff

Merge branch '1.0.x' into schema-x

Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po

lib/default.php

This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)