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
..
groupsalmon.php	Fix L10n/i18n.	2011-04-29 18:59:47 +02:00
ostatusgroup.php	Merge branch 'master' of gitorious.org:statusnet/mainline	2012-07-28 13:59:40 -04:00
ostatusinit.php	Merge remote-tracking branch 'statusnet/master'	2013-08-12 12:23:17 +02:00
ostatuspeopletag.php	Fix L10n/i18n.	2011-04-29 18:59:47 +02:00
ostatussub.php	Add translator documentation.	2011-06-05 11:30:46 +02:00
ostatustag.php	tag -> list	2011-08-20 20:30:37 +02:00
ownerxrd.php	Fix L10n/i18n.	2011-04-29 18:59:47 +02:00
peopletagsalmon.php	Fix L10n/i18n.	2011-04-29 18:59:47 +02:00
pushcallback.php	Fix L10n/i18n.	2011-04-29 18:59:47 +02:00
pushhub.php	Complete "people tag" to "list" in UI messages.	2011-04-17 20:08:03 +02:00
usersalmon.php	tag -> list	2011-08-20 20:30:37 +02:00