Jude Nelson 6648ec84a1 remove <<<<<< from merge

2018-06-20 18:50:02 -04:00

..

lib

remove <<<<<< from merge

2018-06-20 18:50:02 -04:00

__init__.py

/usr/bin/env python -> python2. our code is not python3 friendly, we should specify that

2017-08-17 13:40:01 -04:00

blockstackd.py

bugfix; pass resolver from subdomain db to name on get_name_record

2018-06-20 18:49:36 -04:00

version.py

version bump!

2018-03-22 19:26:04 -04:00