Commit Graph

8 Commits

Author SHA1 Message Date
Daniel Ternyak 06ae70988a merge develop into 'swap_part_3' 2017-07-03 22:21:19 -05:00
crptm bead2b30ad fix merge errors 2017-07-04 06:22:16 +04:00
crptm 40f2c4466a merge develop 2017-07-04 06:18:16 +04:00
Daniel Ternyak 7846b2125a merge develop info 'donation_addresses' 2017-07-03 19:24:22 -05:00
Daniel Ternyak 164e6a07bb fix additional hardcoded address issues 2017-07-03 19:20:47 -05:00
crptm 65234a26c0 fix flow sagas errors 2017-07-04 03:59:27 +04:00
Daniel Ternyak 7cf3d26bbe Merge feat/send-page 2017-07-02 00:49:06 -05:00
crptm 1fb4a004ac send wip 2017-06-27 02:27:55 +04:00