Commit Graph

2 Commits

Author SHA1 Message Date
Danny Coates
fbad1ab55a
formatting update 2018-11-16 12:39:36 -08:00
Donovan Preston
71ea4e74f6
Implement wss preference url in html; Update to work with the tip of vnext branch; allow viewing the android ui from the webpack server (#918)
* Merge branch 'vnext' of https://github.com/mozilla/send into android-preferences

Fix conflicts

* Implement wss preference url in html; Update to work with the tip of vnext branch; allow viewing the android ui from the webpack server

* Use a try/catch in case localStorage isn't available, which it isn't in a ServiceWorker
2018-09-06 18:56:04 -04:00