Merge branch 'master' into 3002-jsonp-get

Conflicts: ckan/tests/controllers/test_api.py
ckan · Jul 1, 2016 · f879df1 · f879df1
2 parents b52909d + e2162f0
commit f879df1
Show file tree

Hide file tree

Showing 43 changed files with 1,434 additions and 818 deletions.
diff --git a/bin/running_stats.py b/bin/running_stats.py
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 '''Tool for a script to keep track changes performed on a large number
 of objects.
 

diff --git a/ckan/config/deployment.ini_tmpl b/ckan/config/deployment.ini_tmpl
@@ -166,11 +166,11 @@ ckan.hide_activity_from_users = %(ckan.site_id)s
 
 ## Email settings
 
-#email_to = you@yourdomain.com
-#error_email_from = paste@localhost
+#email_to = errors@example.com
+#error_email_from = ckan-errors@example.com
 #smtp.server = localhost
 #smtp.starttls = False
-#smtp.user = your_username@gmail.com
+#smtp.user = username@example.com
 #smtp.password = your_password
 #smtp.mail_from =