• mmn's avatar
    Merge remote-tracking branch 'statusnet/master' · f79aec36
    mmn authored
    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
    f79aec36
Name
Last commit
Last update
..
social.php Loading commit data...