Mikael Nordfeldth f79aec36fe Merge remote-tracking branch 'statusnet/master' ... This merges GNU Social with current development of StatusNet. The only conflicts were some documentation, where GNU Social's versions were retained. Conflicts: doc-src/about doc-src/faq plugins/OpenID/doc-src/openid		2013-08-12 12:23:17 +02:00
..
doc-src	Update openid docs	2011-09-30 14:52:51 -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
icons	Squashed commit of the following:	2012-07-09 12:56:09 -04:00
locale	Localisation updates from http://translatewiki.net.	2012-06-30 11:10:38 +00: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	Add translator documentation.	2011-06-05 19:30:04 +02:00
OpenIDPlugin.php	Squashed commit of the following:	2012-07-09 16:54:47 -04:00
openidserver.php	Update translator documentation.	2011-04-27 20:37:44 +02:00
openidsettings.php	Squashed commit of the following:	2012-07-09 16:54:47 -04:00
openidtrust.php	Update translator documentation.	2011-04-27 20:37:44 +02:00
User_openid_prefs.php	Squashed commit of the following:	2012-07-09 16:54:47 -04:00
User_openid_trustroot.php	Update translator documentation.	2011-04-27 20:37:44 +02:00
User_openid.php	Static -> static	2011-08-27 17:42:31 -04:00