]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7aca97 52d29a1)
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
authorIan Denhardt <ian@zenhack.net>
Mon, 28 Mar 2011 07:25:40 +0000 (03:25 -0400)
committerIan Denhardt <ian@zenhack.net>
Mon, 28 Mar 2011 07:25:40 +0000 (03:25 -0400)
1  2 
lib/action.php patch | diff1 | diff2 | blob | history
locale/ca/LC_MESSAGES/statusnet.po patch | diff1 | diff2 | blob | history

diff --cc lib/action.php
Simple merge
diff --cc locale/ca/LC_MESSAGES/statusnet.po
Simple merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)