Ian Denhardt 31b29fde50 Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline ... Conflicts: plugins/OStatus/actions/ostatusinit.php		2011-05-23 21:50:48 -04:00
..
doc-src	Fixed a documentation issue. The OpenID doc page now tells you that gnu-social	2010-06-12 20:09:40 -04:00
extlib	OpenID access control options: trusted provider URL, Launchpad team restrictions. Added an admin panel for setting these and OpenID-only mode, off by default.	2010-05-18 13:28:41 -07:00
locale	Localisation updates from http://translatewiki.net.	2011-05-05 23:24:49 +02:00
finishaddopenid.php	Update translator documentation.	2011-04-27 20:37:44 +02:00
finishopenidlogin.php	Update translator documentation.	2011-04-27 20:37:44 +02:00
openid.php	Update translator documentation.	2011-04-27 20:37:44 +02:00
openidadminpanel.php	Update translator documentation.	2011-04-27 20:37:44 +02:00
openidlogin.php	Update translator documentation.	2011-04-27 20:37:44 +02:00
OpenIDPlugin.php	Update translator documentation.	2011-04-27 20:37:44 +02:00
openidserver.php	Update translator documentation.	2011-04-27 20:37:44 +02:00
openidsettings.php	Update translator documentation.	2011-04-27 20:37:44 +02:00
openidtrust.php	Update translator documentation.	2011-04-27 20:37:44 +02:00
User_openid_trustroot.php	Update translator documentation.	2011-04-27 20:37:44 +02:00
User_openid.php	Update translator documentation.	2011-04-27 20:37:44 +02:00