]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5dc1291 a645d04)
Merge branch '0.9.x' into openidplugin
authorEvan Prodromou <evan@controlyourself.ca>
Fri, 21 Aug 2009 20:27:43 +0000 (16:27 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Fri, 21 Aug 2009 20:27:43 +0000 (16:27 -0400)
commit9f356b55c6f419468771c0f3c2450010c0242abe
tree4cd175c7ef96380b5be82722581d63cf2f2fcb30tree | snapshot
parent5dc1291b59a1079cbe9bab05d12dae06b8e4c96dcommit | diff
parenta645d0468b368c7c659b440f72ec80498055ac3ecommit | diff
Merge branch '0.9.x' into openidplugin

Conflicts:
actions/login.php
actions/register.php
actions/login.php diff1 | diff2 | blob | history
actions/public.php diff1 | diff2 | blob | history
actions/register.php diff1 | diff2 | blob | history
actions/xrds.php diff1 | diff2 | blob | history
index.php diff1 | diff2 | blob | history
lib/router.php diff1 | diff2 | blob | history
lib/util.php diff1 | diff2 | blob | history
plugins/OpenID/finishopenidlogin.php diff1 | | 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. :-)