David Kelly 67f25adac0 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay		2017-08-29 08:02:53 -07:00
..
checkout	Fix security images; actually do the right thing when wallet not set up	2017-08-28 12:18:53 -07:00
purchases	Hook up root_file_url	2017-08-28 12:46:01 -07:00
wallet	fix wallet, use text from server in history (for now)	2017-08-28 17:04:19 -07:00