Merge remote-tracking branch 'origin/master'

# Conflicts:
#	static/style.css

18 files changed, 0 insertions, 18 deletions

diff --git a/pysite/views/main/__init__.py b/pysite/views/main/__init__.py
index 9bad5790..e69de29b 100644
--- a/pysite/views/main/__init__.py
+++ b/pysite/views/main/__init__.py
@@ -1 +0,0 @@
-# coding=utf-8
diff --git a/pysite/views/main/abort.py b/pysite/views/main/abort.py
index d9e3282f..ecfe8f91 100644
--- a/pysite/views/main/abort.py
+++ b/pysite/views/main/abort.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 from werkzeug.exceptions import InternalServerError
 
 from pysite.base_route import RouteView
diff --git a/pysite/views/main/about/__init__.py b/pysite/views/main/about/__init__.py
index 9bad5790..e69de29b 100644
--- a/pysite/views/main/about/__init__.py
+++ b/pysite/views/main/about/__init__.py
@@ -1 +0,0 @@
-# coding=utf-8
diff --git a/pysite/views/main/about/index.py b/pysite/views/main/about/index.py
index a3fecc31..9f211702 100644
--- a/pysite/views/main/about/index.py
+++ b/pysite/views/main/about/index.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 from pysite.base_route import RouteView
 
 
diff --git a/pysite/views/main/about/partners.py b/pysite/views/main/about/partners.py
index b5e7f587..4fe321a5 100644
--- a/pysite/views/main/about/partners.py
+++ b/pysite/views/main/about/partners.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 import json
 from logging import getLogger
 
diff --git a/pysite/views/main/about/rules.py b/pysite/views/main/about/rules.py
index 805936a8..22e79afa 100644
--- a/pysite/views/main/about/rules.py
+++ b/pysite/views/main/about/rules.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 from pysite.base_route import RouteView
 
 
diff --git a/pysite/views/main/error.py b/pysite/views/main/error.py
index 2e432102..07286eb4 100644
--- a/pysite/views/main/error.py
+++ b/pysite/views/main/error.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 from flask import abort
 
 from pysite.base_route import RouteView
diff --git a/pysite/views/main/index.py b/pysite/views/main/index.py
index 210eb057..ef5ed700 100644
--- a/pysite/views/main/index.py
+++ b/pysite/views/main/index.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 from pysite.base_route import RouteView
 
 
diff --git a/pysite/views/main/info/__init__.py b/pysite/views/main/info/__init__.py
index 9bad5790..e69de29b 100644
--- a/pysite/views/main/info/__init__.py
+++ b/pysite/views/main/info/__init__.py
@@ -1 +0,0 @@
-# coding=utf-8
diff --git a/pysite/views/main/info/help.py b/pysite/views/main/info/help.py
index 868b969f..a47362fc 100644
--- a/pysite/views/main/info/help.py
+++ b/pysite/views/main/info/help.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 from pysite.base_route import RouteView
 
 
diff --git a/pysite/views/main/info/index.py b/pysite/views/main/info/index.py
index 3f36e50f..f9fab682 100644
--- a/pysite/views/main/info/index.py
+++ b/pysite/views/main/info/index.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 from pysite.base_route import RouteView
 
 
diff --git a/pysite/views/main/info/jams.py b/pysite/views/main/info/jams.py
index 19e4cb9c..9158091f 100644
--- a/pysite/views/main/info/jams.py
+++ b/pysite/views/main/info/jams.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 from pysite.base_route import RouteView
 
 
diff --git a/pysite/views/main/info/resources.py b/pysite/views/main/info/resources.py
index 2642e1ec..541b9ba1 100644
--- a/pysite/views/main/info/resources.py
+++ b/pysite/views/main/info/resources.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 import json
 from logging import getLogger
 
diff --git a/pysite/views/main/redirects/github.py b/pysite/views/main/redirects/github.py
index d2ceaf49..f861a91c 100644
--- a/pysite/views/main/redirects/github.py
+++ b/pysite/views/main/redirects/github.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 from flask import redirect
 
 from pysite.base_route import RouteView
diff --git a/pysite/views/main/redirects/invite.py b/pysite/views/main/redirects/invite.py
index 5f31d7db..1895d36a 100644
--- a/pysite/views/main/redirects/invite.py
+++ b/pysite/views/main/redirects/invite.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 from flask import redirect
 
 from pysite.base_route import RouteView
diff --git a/pysite/views/main/redirects/stats.py b/pysite/views/main/redirects/stats.py
index 7766f9ed..935f8539 100644
--- a/pysite/views/main/redirects/stats.py
+++ b/pysite/views/main/redirects/stats.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 from flask import redirect
 
 from pysite.base_route import RouteView
diff --git a/pysite/views/main/ws_test.py b/pysite/views/main/ws_test.py
index c53515c5..a0b6215f 100644
--- a/pysite/views/main/ws_test.py
+++ b/pysite/views/main/ws_test.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 import os
 
 from pysite.base_route import RouteView
diff --git a/pysite/views/main/ws_test_rst.py b/pysite/views/main/ws_test_rst.py
index 9c2ee805..e80acc55 100644
--- a/pysite/views/main/ws_test_rst.py
+++ b/pysite/views/main/ws_test_rst.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 import os
 
 from pysite.base_route import RouteView