Merge branch 'v0.5.0.5'

blag · blag · commit 38fbe3b94e55 · 2018-02-10T19:03:51.000-08:00
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ This package officially supports all currently supported versions of Python/Djan
 | Django 1.10   |  :white_check_mark:  | :x: |  :white_check_mark:  |  :white_check_mark:  | :large_blue_circle: |
 | Django 1.11   |  :white_check_mark:  | :x: | :white_check_mark:   | :white_check_mark:   | :white_check_mark:  |
 | Django 2.0    |  :x:                 | :x: | :white_check_mark:   | :white_check_mark:   | :white_check_mark:  |
-| Django [master](https://github.com/django/django/archive/master.tar.gz) | :x: | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Django [master](https://github.com/django/django/archive/master.tar.gz) | :x: | :x: | :x: | :x: | :x: |
 
 | Key |                                                                     |
 | :-: | :------------------------------------------------------------------ |
diff --git a/cities/conf.py b/cities/conf.py
@@ -288,7 +288,7 @@ def get_locales(self):
         try:
             locales.remove('LANGUAGES')
             locales += [e[0] for e in django_settings.LANGUAGES]
-        except Exception:
+        except:
             pass
 
         return set([e.lower() for e in locales])
diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@ def read(fname):
 
 setup(
     name='django-cities',
-    version='0.5.0.4',
+    version='0.5.0.5',
     description='Place models and worldwide place data for Django',
     author='Ben Dowling',
     author_email='ben.m.dowling@gmail.com',
