Imdad Ahad f9b539d71e Fix conflict

2016-09-27 16:54:00 +01:00

..

__init__.py

…

test_api_key_endpoints.py

remove default key_type

2016-06-27 17:00:02 +01:00

test_rest.py

Use client fixture

2016-09-23 10:41:37 +01:00

test_service_whitelist.py

Fix PEP8 issues

2016-09-27 14:16:35 +01:00

test_statistics.py

still return service if they have never sent any notifications

2016-08-24 15:00:51 +01:00

test_url_for.py

…