 Nathan Schneider
|
9ab240a4fe
Merge branch 'patch-14' into 'master'
|
4 years ago |
|
Nathan Schneider
|
954e5ee5ca
Merge branch 'patch-13' into 'master'
|
4 years ago |
|
Nathan Schneider
|
bf1f3b3985
Merge branch 'patch-12' into 'master'
|
4 years ago |
|
Nathan Schneider
|
cd17517967
Merge branch 'patch-11' into 'master'
|
4 years ago |
 Laura daley
|
e148c0305c
Update term_limit.md
|
4 years ago |
|
Laura daley
|
08d91cf3e3
Update debate.md
|
4 years ago |
|
Laura daley
|
38c39b0f05
Update debate.md
|
4 years ago |
|
Laura daley
|
13ee63129a
Update constitution.md
|
4 years ago |
|
Nathan Schneider
|
eb395e27a6
Update docs/mediums/debate.md, docs/mediums/consensus_process.md, docs/mediums/consensus.md files
|
4 years ago |
|
Nathan Schneider
|
cf20fb32c0
Deleted docs/mediums/consensus_protocol.md
|
4 years ago |
|
Nathan Schneider
|
69124e0a88
Merge branch 'patch-10' into 'master'
|
4 years ago |
|
Laura daley
|
7a1a51f988
Update debate.md
|
4 years ago |
|
Nathan Schneider
|
24e19fc652
Revisions to constitution.md
|
4 years ago |
|
Nathan Schneider
|
5524e5107c
Merge branch 'patch-9' into 'master'
|
4 years ago |
|
Laura daley
|
605bb5054f
Update constitution.md
|
4 years ago |
|
Nathan Schneider
|
c590787ca6
Added placeholder for Rough Consensus.
|
4 years ago |
|
Nathan Schneider
|
2c10cd877e
Updated caucus.md with @lcdaley's edits
|
4 years ago |
|
Nathan Schneider
|
5ad80f70e4
Updated coalition.md with @lcdaley's edits
|
4 years ago |
|
Nathan Schneider
|
abf86e22a5
Update docs/mediums/membership.md
|
4 years ago |
|
Nathan Schneider
|
77479b5eb8
Update docs/mediums/caucus.md
|
4 years ago |
|
Nathan Schneider
|
89381f3c73
Merge branch 'patch-6' into 'master'
|
4 years ago |
|
Laura daley
|
f2e11b8976
Update caucus.md
|
4 years ago |
|
Nathan Schneider
|
124cc52ca0
Update docs/mediums/proportional_representation.md
|
4 years ago |
|
Nathan Schneider
|
de0956f56d
Further concision for proportional_representation.md
|
4 years ago |
|
Nathan Schneider
|
6ff3835112
Small edits to new entries
|
4 years ago |
|
Nathan Schneider
|
46afd4b8a8
Merge branch 'patch-4' into 'master'
|
4 years ago |
|
Nathan Schneider
|
7832281c52
Merge branch 'patch-5' into 'master'
|
4 years ago |
|
Laura daley
|
e0f63ff1e7
Update proportional_representation.md
|
4 years ago |
|
Laura daley
|
64ea6a12ca
Update approval-voting.md
|
4 years ago |
|
Nathan Schneider
|
159a99ee73
Update do-ocracy.md
|
4 years ago |
