Merge branch 'master' into zcash-master-103

Conflicts:
	README.md
This commit is contained in:
Rhett Creighton 2016-11-19 14:51:21 -08:00
commit ac294fb3d2
1 changed files with 1 additions and 1 deletions

View File

@ -60,7 +60,7 @@ https://github.com/z-classic/zclassic/wiki/1.0-User-Guide
### Want to participate in development?
* Code review is welcome!
* Code review is welcome!
* If you want to get to know us join our slack: http://zclassic.herokuapp.com/