fixing merge

5 files changed, 19 insertions, 10 deletions

diff --git a/doc/developer/code-contribution.md b/doc/developer/code-contribution.md
index c796a82a5..e9b088beb 100644
--- a/doc/developer/code-contribution.md
+++ b/doc/developer/code-contribution.md
@@ -31,7 +31,12 @@ git checkout -b <branch name>
 
 ## Submitting a Pull Request 
 
-1. Please add yourself to the contributor list prior to submitting by completing the [contributor license agreement](http://www.mattermost.org/mattermost-contributor-agreement/). 
+1. Please add yourself to the Mattermost [approved contributor list](https://docs.google.com/spreadsheets/d/1NTCeG-iL_VS9bFqtmHSfwETo5f-8MQ7oMDE5IUYJi_Y/pubhtml?gid=0&single=true) prior to submitting by completing the [contributor license agreement](http://www.mattermost.org/mattermost-contributor-agreement/). 
+
+  For pull requests made by contributors not yet added to the approved contributor list, a reviewer may respond: 
+  
+  ```Thanks @[username] for the pull request! Before we can review, we need to add you to the list of [approved contributors](https://docs.google.com/spreadsheets/d/1NTCeG-iL_VS9bFqtmHSfwETo5f-8MQ7oMDE5IUYJi_Y/pubhtml?gid=0&single=true).  Please help complete the Mattermost [contribution license agreement](http://www.mattermost.org/mattermost-contributor-agreement/), which is a standard procedure for many open source projects. More information is in the above link. Please let us know if you have any questions. We are very happy to have you join our growing community!``` 
+
 
 2. When you submit your pull request please include the Ticket ID at the beginning of your pull request comment, followed by a colon. 
 
diff --git a/docker/0.6/config_docker.json b/docker/0.6/config_docker.json
index 157120b99..b1c72c4bd 100644
--- a/docker/0.6/config_docker.json
+++ b/docker/0.6/config_docker.json
@@ -10,7 +10,7 @@
     "ServiceSettings": {
         "SiteName": "Mattermost",
         "Mode" : "dev",
-		"AllowTesting" : false,
+        "AllowTesting" : false,
         "UseSSL": false,
         "Port": "80",
         "Version": "developer",
@@ -63,8 +63,8 @@
         "SMTPUsername": "",
         "SMTPPassword": "",
         "SMTPServer": "",
-		"UseTLS": false,
-		"UseStartTLS": false,
+        "UseTLS": false,
+        "UseStartTLS": false,
         "FeedbackEmail": "",
         "FeedbackName": "",
         "ApplePushServer": "",
diff --git a/docker/0.7/config_docker.json b/docker/0.7/config_docker.json
index 794ac95ae..cbac2ea69 100644
--- a/docker/0.7/config_docker.json
+++ b/docker/0.7/config_docker.json
@@ -10,7 +10,7 @@
     "ServiceSettings": {
         "SiteName": "Mattermost",
         "Mode" : "dev",
-		"AllowTesting" : true,
+        "AllowTesting" : true,
         "UseSSL": false,
         "Port": "80",
         "Version": "developer",
@@ -65,8 +65,8 @@
         "SMTPUsername": "",
         "SMTPPassword": "",
         "SMTPServer": "",
-		"UseTLS": false,
-		"UseStartTLS": false,
+        "UseTLS": false,
+        "UseStartTLS": false,
         "FeedbackEmail": "",
         "FeedbackName": "",
         "ApplePushServer": "",
diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json
index bc42951b8..aceeb95b4 100644
--- a/docker/dev/config_docker.json
+++ b/docker/dev/config_docker.json
@@ -10,7 +10,7 @@
     "ServiceSettings": {
         "SiteName": "Mattermost",
         "Mode" : "dev",
-		"AllowTesting" : true,
+        "AllowTesting" : true,
         "UseSSL": false,
         "Port": "80",
         "Version": "developer",
@@ -66,8 +66,8 @@
         "SMTPUsername": "",
         "SMTPPassword": "",
         "SMTPServer": "",
-		"UseTLS": false,
-		"UseStartTLS": false,
+        "UseTLS": false,
+        "UseStartTLS": false,
         "FeedbackEmail": "",
         "FeedbackName": "",
         "ApplePushServer": "",
diff --git a/store/sql_store.go b/store/sql_store.go
index c0b3c2021..cf6fae6d4 100644
--- a/store/sql_store.go
+++ b/store/sql_store.go
@@ -144,6 +144,10 @@ func (ss SqlStore) DoesColumnExist(tableName string, columnName string) bool {
 		)
 
 		if err != nil {
+			if err.Error() == "pq: relation \""+strings.ToLower(tableName)+"\" does not exist" {
+				return false
+			}
+
 			l4g.Critical("Failed to check if column exists %v", err)
 			time.Sleep(time.Second)
 			panic("Failed to check if column exists " + err.Error())