diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-01-20 23:13:02 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-01-20 23:13:02 -0500 |
| commit | 4b9df58c90e25ea79aeec64c6e96f828fe06d7df (patch) | |
| tree | ac237014d015535d07babba42d40d86608de0ec5 /doc/faq | |
| parent | bd056218f9a595184ac7bcac0c1dc6a8981d7af2 (diff) | |
| parent | 65bfda33b8464caf14ce268c9bea2e7eceb27fe5 (diff) | |
Merge branch 'master' into groups
Conflicts:
.gitignore
Diffstat (limited to 'doc/faq')
| -rw-r--r-- | doc/faq | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -12,7 +12,7 @@ and fans. How is %%site.name%% different from Twitter, Jaiku, Pownce, Plurk, others? -------------------------------------------------------------------------- -%%site.name%% is an [Open Network Service](http://opendefinition.org/osd). Our main +%%site.name%% is an [Open Network Service](http://opendefinition.org/ossd). Our main goal is to provide a fair and transparent service that preserves users' autonomy. In particular, all the software used for %%site.name%% is [Free Software](http://en.wikipedia.org/wiki/Free_Software), and all the data is available under the [%%license.title%%](%%license.url%%) license, making it Open Data. |