]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 727ea5a 23bad16)
Merge branch '0.9.x' into 1.0.x
authorCraig Andrews <candrews@integralblue.com>
Sun, 18 Apr 2010 23:21:15 +0000 (19:21 -0400)
committerCraig Andrews <candrews@integralblue.com>
Sun, 18 Apr 2010 23:21:15 +0000 (19:21 -0400)
commit39392e03a71d94d6b984033b994b417edfc2d8d6
treecb3ae36fc9a20a4cd884e271ef36dcce28f109c8tree | snapshot
parent727ea5a5163249eb40fa0c4b2c63054fc997473bcommit | diff
parent23bad16bba52a09f0cea3d2c40e6cf91e2945e37commit | diff
Merge branch '0.9.x' into 1.0.x

Conflicts:
actions/confirmaddress.php
actions/imsettings.php
actions/apiaccountupdatedeliverydevice.php diff1 | diff2 | blob | history
actions/confirmaddress.php diff1 | diff2 | blob | history
actions/imsettings.php diff1 | diff2 | blob | history
actions/shownotice.php diff1 | diff2 | blob | history
classes/User.php diff1 | diff2 | blob | history
lib/adminpanelaction.php diff1 | diff2 | blob | history
lib/command.php diff1 | diff2 | blob | history
lib/implugin.php diff1 | | blob | history
lib/statusnet.php diff1 | diff2 | blob | history
lib/util.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. :-)