Nathan Schneider 46afd4b8a8 Merge branch 'patch-4' into 'master' ...

Update approval-voting.md

See merge request medlabboulder/democraticmediums!4

2019-06-07 20:47:59 +00:00

..

about

Update docs/mediums/lazy_consensus.md, docs/about/resources.md files

2019-06-05 23:36:46 +00:00

images

Added a few dummy directories

2019-04-07 23:42:00 -06:00

mediums

Merge branch 'patch-4' into 'master'

2019-06-07 20:47:59 +00:00

stylesheets

Created several example entries; edited the .template.md; added to the Contribute page

2019-04-09 23:02:05 -06:00

index.md

Added Do-ocracy and some other edits

2019-06-05 21:53:40 +00:00