]> 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: 58254aa fd847c2)
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
authorIan Denhardt <ian@zenhack.net>
Tue, 24 May 2011 01:50:48 +0000 (21:50 -0400)
committerIan Denhardt <ian@zenhack.net>
Tue, 24 May 2011 01:50:48 +0000 (21:50 -0400)
commit31b29fde50e9664e1b70064c043879ce87553883
tree20f3bbafb9f0282deed6d0d7734fd34285456d14tree | snapshot
parent58254aa4970392b5d9eab36974fe89c50227c84fcommit | diff
parentfd847c29c517d51851213168c3129b7b5169b5b8commit | diff
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline

Conflicts:
plugins/OStatus/actions/ostatusinit.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. :-)