diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-18 15:58:13 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-18 15:58:13 -0700 |
| commit | 2dd0e7f6bd02748567d8b21f793bd8c6f15f55ce (patch) | |
| tree | 9d4182a586b5d2bd68baaa2d5b03f0c51828bb0d /doc/features.bb | |
| parent | 51db7536380d70e2047aa91c3a12809cc3444aa8 (diff) | |
| parent | d42d7d0532adb27c966c9ee2ddd76e33c0d0972f (diff) | |
| download | volse-hubzilla-2dd0e7f6bd02748567d8b21f793bd8c6f15f55ce.tar.gz volse-hubzilla-2dd0e7f6bd02748567d8b21f793bd8c6f15f55ce.tar.bz2 volse-hubzilla-2dd0e7f6bd02748567d8b21f793bd8c6f15f55ce.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
view/nl/messages.po
view/nl/strings.php
Diffstat (limited to 'doc/features.bb')
| -rw-r--r-- | doc/features.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/features.bb b/doc/features.bb index 8d51d9853..e8d1cd687 100644 --- a/doc/features.bb +++ b/doc/features.bb @@ -191,8 +191,8 @@ Similar to any other modern blogging system, social network, or a micro-blogging [b]Previewing/Editing[/b]
Post can be previewed prior to sending and edited after sending.
-[b]Voting/Concensus[/b]
-Posts can be turned into "concensus" items which allows readers to offer feedback, which is collated into "agree", "disagree", and "abstain" counters. This lets you gauge interest for ideas and create informal surveys.
+[b]Voting/Consensus[/b]
+Posts can be turned into "consensus" items which allows readers to offer feedback, which is collated into "agree", "disagree", and "abstain" counters. This lets you gauge interest for ideas and create informal surveys.
[b]Extending $Projectname[/b]
|