GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
gnu-social/doc-src
History
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
..
about bring about page up-to-date 2011-09-30 14:33:08 -04:00
api Add a doc page that links to the StatusNet wiki API page 2010-10-12 23:38:16 -04:00
contact update contact 2011-09-30 14:53:30 -04:00
faq update faq 2011-09-30 14:53:23 -04:00
groups update groups help 2011-09-30 14:53:16 -04:00
help update base help 2011-09-30 14:53:10 -04:00
im Issue #3049 - resync doc/im with the help command text (various additions since doc was last edited) 2011-02-21 11:23:07 -08:00
privacy explicitly license documentation under CC-BY 3.0 2010-09-03 15:26:25 -04:00
sms explicitly license documentation under CC-BY 3.0 2010-09-03 15:26:25 -04:00
source explicitly license documentation under CC-BY 3.0 2010-09-03 15:26:25 -04:00
tags update tags docs 2011-09-30 14:53:01 -04:00
tos replace 'public' in documentation with 'top' 2011-09-30 10:09:41 -04:00