GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
f715821cf0
gnu-social/doc-src
History
Zach Copley b7d0746694 Merge branch '0.9.x' into 1.0.x 
Conflicts:
	actions/confirmaddress.php
	actions/emailsettings.php
	actions/hostmeta.php
	actions/imsettings.php
	actions/login.php
	actions/profilesettings.php
	actions/showgroup.php
	actions/smssettings.php
	actions/urlsettings.php
	actions/userauthorization.php
	actions/userdesignsettings.php
	classes/Memcached_DataObject.php
	index.php
	lib/accountsettingsaction.php
	lib/action.php
	lib/common.php
	lib/connectsettingsaction.php
	lib/designsettings.php
	lib/personalgroupnav.php
	lib/profileaction.php
	lib/userprofile.php
	plugins/ClientSideShorten/ClientSideShortenPlugin.php
	plugins/Facebook/FBConnectSettings.php
	plugins/Facebook/FacebookPlugin.php
	plugins/NewMenu/NewMenuPlugin.php
	plugins/NewMenu/newmenu.css
2011-02-28 15:39:43 -08:00
..
about explicitly license documentation under CC-BY 3.0 2010-09-03 15:26:25 -04:00
api Add a doc page that links to the StatusNet wiki API page 2010-10-12 23:38:16 -04:00
badge explicitly license documentation under CC-BY 3.0 2010-09-03 15:26:25 -04:00
bookmarklet explicitly license documentation under CC-BY 3.0 2010-09-03 15:26:25 -04:00
contact explicitly license documentation under CC-BY 3.0 2010-09-03 15:26:25 -04:00
faq explicitly license documentation under CC-BY 3.0 2010-09-03 15:26:25 -04:00
groups explicitly license documentation under CC-BY 3.0 2010-09-03 15:26:25 -04:00
help Add a doc page that links to the StatusNet wiki API page 2010-10-12 23:38:16 -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
openmublog explicitly license documentation under CC-BY 3.0 2010-09-03 15:26:25 -04: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 explicitly license documentation under CC-BY 3.0 2010-09-03 15:26:25 -04:00
tos explicitly license documentation under CC-BY 3.0 2010-09-03 15:26:25 -04:00