config.py
464 Bytes
-
Merge branch 'master' of https://github.com/tiwilliam/pygeoip · 55d3de43
Conflicts: pygeoip/__init__.py tests/config.py tests/test_pygeoip.py
William Tisäter committed
Conflicts: pygeoip/__init__.py tests/config.py tests/test_pygeoip.py