So... seems like we both push to master. #3

Merged

alisolarflare merged 3 commits from master into dev

2017-06-10 07:25:12 +00:00

Author	SHA1	Message	Date
alisolarflare	4707c4fe2f	Proposed change to implement Feature requeeeessssst	2017-06-10 00:19:07 -07:00
NorbiPeti	ee57821c87	Fixed keystore password That's what you get for getting the code from at least 3 different stack overflow threads	2017-06-06 07:57:49 +02:00
NorbiPeti	33bf2286e9	Merge branch 'dev'	2017-06-05 22:39:28 +02:00