From ea7949ad8e2e4c0aadce63d434b3c375477dd101 Mon Sep 17 00:00:00 2001
From: Andreas Rosdal <41650711+andreasrosdal@users.noreply.github.com>
Date: Fri, 26 Jul 2019 11:57:54 +0200
Subject: [PATCH 1/2] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f2857df8a..f1535e959 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,16 +1,27 @@
 # Contributing to Freeciv-Web
 
-Thank you for your interest in contributing!
+Thank you for your interest in contributing to Freeciv-web!
 
 ## Getting Started
 
-The developers of this project can be found in freenode IRC #freeciv-dev
-and in this discord [guild](https://discord.gg/X8bKbry), channel #dev. If
-you want an idea for a good starting project, poke someone in there first.
+Freeciv is an open source project where contributions from the open source community is encouraged.
+There are multiple versions of Freeciv-web, and Freeciv-web can be hosted on multiple server instances.
+To get involved in one of these Freeciv-web instances, you may either contribute directly to the 
+github.com/freeciv/freeciv-web repository by submitting a pull-request there, or contact one of the fork projects
+of Freeciv-web on GitHub, IRC, e-mailing lists, Discord or similar.
+
+## Multiple Freeciv-web servers
+We need to recognize that there are multiple competing Freeciv-web servers, and that the main 
+freeciv/freeciv-web github repository must be generic and not specific to one site. 
+We will get a better Freeciv-web service if we allow multiple servers to exists and compete.
 
 ## Pull Request Guidelines
 
-- Try not to exceed 200 LOC +- in a single PR.
+- All changes to Freeciv-web must be done using Pull Requests on GitHub. Don't commit changes directly to the master or develop branch. 
+- Pull requests must be approved by two other Freeciv developers. Minor changes can be approved by one Freeciv developer.
+- Don't break the build. All tests run by Travis CI must pass successfully.
+- The repository github.com/freeciv/freeciv-web should be generic, not specific to one particular Freeciv-web server instance or Freeciv-web fork.
+- Try not to exceed 200 LOC +- in a single PR. Larger pull-requests are allowed when required.
 - Avoid whitespace-only or other trivial changes that do not change logic.
 
 The best thing you can do is to keep commits and PRs contextual. Small PRs

From d454d1417eb25759191073feba75675d8be5926d Mon Sep 17 00:00:00 2001
From: Andreas Rosdal <41650711+andreasrosdal@users.noreply.github.com>
Date: Fri, 26 Jul 2019 23:44:13 +0200
Subject: [PATCH 2/2] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f1535e959..b5af6ac0c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,7 +18,7 @@ We will get a better Freeciv-web service if we allow multiple servers to exists
 ## Pull Request Guidelines
 
 - All changes to Freeciv-web must be done using Pull Requests on GitHub. Don't commit changes directly to the master or develop branch. 
-- Pull requests must be approved by two other Freeciv developers. Minor changes can be approved by one Freeciv developer.
+- Pull requests must be approved by two other Freeciv developers. Minor changes can be approved by one Freeciv developer. If there's no objections within 72h to the pull request, it's ok to merge it.
 - Don't break the build. All tests run by Travis CI must pass successfully.
 - The repository github.com/freeciv/freeciv-web should be generic, not specific to one particular Freeciv-web server instance or Freeciv-web fork.
 - Try not to exceed 200 LOC +- in a single PR. Larger pull-requests are allowed when required.