Commit graph

7 commits

Author SHA1 Message Date
hackrush
5b49915ff6 Merge branch 'master' into tipping_button 2017-09-01 14:02:35 +05:30
hackrush
b973524901 Fixed modals 2017-08-31 09:45:13 +05:30
Jeremy Kauffman
c7522dc0a5 better?
merging is hard

releasable?
2017-08-29 17:42:11 -04:00
Jeremy Kauffman
b07682ef9d wallet changes
finish rebase
2017-08-29 17:42:09 -04:00
Jeremy Kauffman
8c012bc087 negative progress 2017-08-29 14:40:30 -04:00
Jeremy Kauffman
7b5e752e90 properly split welcome modal logic 2017-08-29 14:40:30 -04:00
Jeremy Kauffman
5bec6accc2 mostly done
refactor modals and settings, clean-up CHANGELOG
2017-08-18 17:47:30 -04:00