Merge remote-tracking branch 'upstream/defiant-dingirma' into dev

This commit is contained in:
Rafael Taranto 2019-11-28 22:03:37 +00:00
commit db3a4e4936
25 changed files with 532 additions and 460 deletions

View file

@ -2,7 +2,7 @@
"name": "lamassu-server",
"description": "bitcoin atm client server protocol module",
"keywords": [],
"version": "7.3.2",
"version": "7.5.0-beta.0",
"license": "Unlicense",
"author": "Lamassu (https://lamassu.is)",
"dependencies": {