]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: beae3db aecdba1)
Merge remote branch 'laconica/0.8.x' into 0.9.x
authorCraig Andrews <candrews@integralblue.com>
Thu, 10 Sep 2009 02:52:38 +0000 (22:52 -0400)
committerCraig Andrews <candrews@integralblue.com>
Thu, 10 Sep 2009 02:52:38 +0000 (22:52 -0400)
commitd7ae0ed4fd755ebad0788a17d0f2fb6a6ca9d63b
treedf58e167fe84f49af11edce4d0a7ebc34e480510tree | snapshot
parentbeae3db41375879e725af053edf8041bbd76ac8ccommit | diff
parentaecdba1ded89b45f32d0b7615ce6b103478403ddcommit | diff
Merge remote branch 'laconica/0.8.x' into 0.9.x

Conflicts:
lib/omb.php
12 files changed:
actions/editgroup.php diff1 | diff2 | blob | history
actions/groupsearch.php diff1 | diff2 | blob | history
actions/invite.php diff1 | diff2 | blob | history
actions/login.php diff1 | diff2 | blob | history
actions/noticesearch.php diff1 | diff2 | blob | history
actions/othersettings.php diff1 | diff2 | blob | history
actions/profilesettings.php diff1 | diff2 | blob | history
actions/register.php diff1 | diff2 | blob | history
lib/omb.php diff1 | diff2 | blob | history
lib/util.php diff1 | diff2 | blob | history
plugins/OpenID/openidlogin.php diff1 | | blob | history
plugins/OpenID/openidsettings.php diff1 | | 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. :-)