Muneeb Ali 3a79c9e0d9 fixed merge conflicts

2016-02-25 00:26:42 -05:00

..

__init__.py

Rename BlockstoreDB to BlockstackDB

2016-02-23 15:56:09 -05:00

namedb.py

fixed merge conflicts

2016-02-25 00:26:42 -05:00

virtualchain_hooks.py

virtual chain name is now 'blockstack-server' to avoid conflicts with the new client.

2016-02-24 15:48:44 +00:00