softsimon aaf9d9be9f
Merge branch 'master' into simon/angular-universal
* master:
  correcting merge
  Remove extra space in price server URL
  Modify upgrade script to append repo before tag name
  Merge "getInitData" method from simon/angular-universal.
  Replace opennode usd price source with wiz api. fixes #166
  Display confidential instead of nothing for confidential assets. fixes #110
  Detect confidential assets and display properly. fixes #109
  Allow searching for and viewing assets not in the asset registry. fixes #111

# Conflicts:
#	backend/src/api/websocket-handler.ts
2020-11-23 14:08:50 +07:00
..
2020-09-28 16:32:48 +07:00
2020-11-07 04:30:52 +07:00
2020-09-28 16:32:48 +07:00
2020-08-09 10:39:27 +07:00
2020-09-26 22:46:26 +07:00
2020-07-02 17:56:15 +07:00