]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - plugins/BlogspamNet/locale/zh_CN/LC_MESSAGES/BlogspamNet.po
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9182481 7f4a9c4)
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
authorIan Denhardt <ian@zenhack.net>
Tue, 15 Mar 2011 16:42:58 +0000 (12:42 -0400)
committerIan Denhardt <ian@zenhack.net>
Tue, 15 Mar 2011 16:42:58 +0000 (12:42 -0400)
commit27ef3b1d905cdf8f47b47293a757624dda88fdc7
tree383141c5b6012cee1080677a202b3319b139bdc5tree | snapshot
parent9182481edd5d7aa4a9f23a3c624046f168518116commit | diff
parent7f4a9c4145f272fa389480ae09e0c24229f324d5commit | diff
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline

Conflicts:
actions/public.php
lib/action.php diff1 | diff2 | blob | history
locale/ca/LC_MESSAGES/statusnet.po diff1 | diff2 | blob | history
plugins/OStatus/actions/ostatusinit.php diff1 | diff2 | blob | history
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)