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 |
||
---|---|---|
.. | ||
groupsalmon.php | ||
ostatusgroup.php | ||
ostatusinit.php | ||
ostatuspeopletag.php | ||
ostatussub.php | ||
ostatustag.php | ||
ownerxrd.php | ||
peopletagsalmon.php | ||
pushcallback.php | ||
pushhub.php | ||
usersalmon.php |