From 047dc3d6348d0d30bdd828a9cc2a29e0d5946eca Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 19 Jan 2015 09:01:45 -0600 Subject: Update to latest django-countries Signed-off-by: Dan McGee --- requirements.txt | 2 +- requirements_prod.txt | 2 +- settings.py | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index 54cf90f0..72e8d080 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ Markdown==2.5.2 MarkupSafe==0.23 bencode==1.0 django-jinja==1.0.5 -django_countries==3.0.2 +django_countries==3.1.1 jsmin==2.1.0 pgpdump==1.5 pytz>=2014.10 diff --git a/requirements_prod.txt b/requirements_prod.txt index ac528ef9..42d82ceb 100644 --- a/requirements_prod.txt +++ b/requirements_prod.txt @@ -6,7 +6,7 @@ Markdown==2.5.2 MarkupSafe==0.23 bencode==1.0 django-jinja==1.0.5 -django_countries==3.0.2 +django_countries==3.1.1 jsmin==2.1.0 pgpdump==1.5 psycopg2==2.5.4 diff --git a/settings.py b/settings.py index 60fe71bc..3f0f8e69 100644 --- a/settings.py +++ b/settings.py @@ -155,7 +155,6 @@ LOGGING = { }, } - ## Server used for linking to PGP keysearch results PGP_SERVER = 'pgp.mit.edu:11371' @@ -175,11 +174,6 @@ TORRENT_TRACKERS = ( 'http://tracker.archlinux.org:6969/announce', ) -# Country name overrides for display purposes -COUNTRIES_OVERRIDE = { - 'MK': 'Macedonia', -} - ## Import local settings from local_settings import * -- cgit v1.2.3-55-g3dc8