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: 54f7154 a7abb23)

author	Brion Vibber <brion@pobox.com>
	Mon, 31 Jan 2011 19:50:06 +0000 (11:50 -0800)
committer	Brion Vibber <brion@pobox.com>
	Mon, 31 Jan 2011 19:50:06 +0000 (11:50 -0800)
commit	47f31bce47b182aa55c02c7872d7e473d3ab10f2
tree	6c4760877a0744aa962e1199042455885604b91c	tree \| snapshot
parent	54f7154db8146e42dfa557d3d0651fd3255ac380	commit \| diff
parent	a7abb2323e7d57125b9fbc903a1cecc06c27944e	commit \| diff

Merge branch 'master' into testing

Conflicts:
classes/Profile.php

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. :-)