From c3a7a523bc14598ac44c2464f11caca42bb04680 Mon Sep 17 00:00:00 2001 From: Joram van den Boezem Date: Wed, 31 May 2017 02:21:33 +0200 Subject: [PATCH] merging PR #392: Update README in anticipation of #377 https://github.com/chaosbot/Chaos/pull/392: Update README in anticipation of #377 Description: :ok_woman: PR passed with a vote of 20 for and 0 against, a weighted total of 19.5 and a threshold of 6.5, and a current meritocracy review. Vote record: @Ayyko: 1 @Leigende: 1 @MUCHZER: 1 @Mursaat: 1 @Smittyvb: 1 @SylvainThrd: 1 @andrewda: 1 @cthulhuely: 1 @davidak: 1 @eukaryote31: 1 @flibustier: 1 @hongaar: 1 @ike709: 1 @md678685: 1 @mikesmiffy128: 1 @phil-r: 1 @reddraggone9: 1 @rhengles: 1 @rudehn: 1 @viktorsec: 1 --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 16cd0791..88997736 100644 --- a/README.md +++ b/README.md @@ -56,10 +56,10 @@ Votes on a PR are determined through following mechanism: depending on the local server time. * While the voting process is going, users can change their reactions and edit their comments, effectively changing their vote. - + Emoji which count as votes are: -* +1: :+1: :thumbsup: :heart: :two_hearts: :blue_heart: :purple_heart: :green_heart: :yellow_heart: :heartpulse: :sparkling_heart: :tada: :heart_eyes: :grin: :grinning: :joy: :ok_hand: :fire: :metal: :raised_hands: :100: :heavy_check_mark: :white_check_mark: :ballot_box_with_check: :accept: :congratulations: -* -1: :-1: :thumbsdown: :confused: :x: :interrobang: :heavy_multiplication_x: :put_litter_in_its_place: :no_entry: :negative_squared_cross_mark: :worried: :frowning: :anguished: :grimacing: :cold_sweat: :disappointed: :weary: :confounded: :cry: :tired_face: :broken_heart: :hankey: :poop: :shit: :fu: :no_good: :person_frowning: +* +1: :+1: :thumbsup: :heart: :two_hearts: :blue_heart: :purple_heart: :green_heart: :yellow_heart: :heartpulse: :sparkling_heart: :tada: :heart_eyes: :grin: :grinning: :joy: :ok_hand: :fire: :metal: :raised_hands: :100: :heavy_check_mark: :white_check_mark: :ballot_box_with_check: :accept: :congratulations: +* -1: :-1: :thumbsdown: :confused: :x: :interrobang: :heavy_multiplication_x: :put_litter_in_its_place: :no_entry: :negative_squared_cross_mark: :worried: :frowning: :anguished: :grimacing: :cold_sweat: :disappointed: :weary: :confounded: :cry: :tired_face: :broken_heart: :hankey: :poop: :shit: :fu: :no_good: :person_frowning: ## Development @@ -81,6 +81,7 @@ Chaosbot has been ruled by: - Democracy, as the anarchy commit crashed the server and was reverted - @PlasmaPower with [#138](https://github.com/chaosbot/chaos/pull/138) - Democracy, as PlasmaPower relinquished his control with [#153](https://github.com/chaosbot/chaos/pull/153) +- Direct democracy + meritocracy with [#377](https://github.com/chaosbot/Chaos/pull/377) ## Server details