7 Commits

Author	SHA1	Message	Date
frankiebee	4451593867	Clean up messy merge	2017-03-23 14:35:01 -07:00
frankiebee	54e157020e	Merge branch 'mascaraMix' into mascara	2017-03-23 14:24:06 -07:00
frankiebee	412cc2394a	Get mascara to send a transaction in the ui	2017-03-23 14:22:05 -07:00
frankiebee	197e6e0b77	WIP: indexdb is at an err state "provider is undefined"	2017-03-23 11:41:32 -07:00
frankiebee	d4e8ff188b	WIP:stream	2017-03-21 15:35:01 -07:00
frankiebee	60f00a950c	notes and clean up	2017-03-09 21:53:49 -08:00
frankiebee	9f3445252c	put background in service worker	2017-03-09 18:24:41 -08:00