aboutsummaryrefslogtreecommitdiffstats
path: root/docs/mediagoblin.rst
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-05-12 23:34:19 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-05-12 23:34:19 -0500
commit9a22d0a0232647c37bb9c8afc57deaf31f0ec9b2 (patch)
treedfb86d9276cb6c0463677557c482327c6613d373 /docs/mediagoblin.rst
parent376e6ef296299570ed3e09fca50536bbbf48328a (diff)
parentbdcd615c3cf290565025a46aa03f986c472be7fc (diff)
downloadmediagoblin-9a22d0a0232647c37bb9c8afc57deaf31f0ec9b2.tar.lz
mediagoblin-9a22d0a0232647c37bb9c8afc57deaf31f0ec9b2.tar.xz
mediagoblin-9a22d0a0232647c37bb9c8afc57deaf31f0ec9b2.zip
Merge remote branch 'refs/remotes/dneelyeps/master'
Diffstat (limited to 'docs/mediagoblin.rst')
-rw-r--r--docs/mediagoblin.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/mediagoblin.rst b/docs/mediagoblin.rst
index df2190c1..ea9c83a7 100644
--- a/docs/mediagoblin.rst
+++ b/docs/mediagoblin.rst
@@ -26,8 +26,8 @@ Why are we doing this?
Centralization and proprietization of media on the internet is a
serious problem and makes the web go from a system of extreme
resilience to a system of frightening fragility. We believe people
-should be able to own their data and that measn someone has to build
-the tools to make it possible. We decide that in this case, that
+should be able to own their data and that means someone has to build
+the tools to make it possible. We decided that in this case, that
someone would be us!