eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline

Browse Source 
Conflicts:
	lib/action.php
	plugins/OStatus/actions/ostatusinit.php
This commit is contained in:
Ian Denhardt
2010-12-20 15:17:31 -05:00
parent 46e5df0996 d8a3a88ec8
commit e36399974e
2139 changed files with 307974 additions and 86695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc-src/faq
View File

@@ -1,3 +1,7 @@
<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
These are some *Frequently Asked Questions* about this service, with
some answers.