[devdocsgjs/main: 637/1867] Merge branch 'fix-firefox-preferences' into service-worker

[Andy Holmes <andyholmes src gnome org>]

commit 5edbb16c1bd41ad8be15acba4f2d81b4f2c96a5a
Merge: b5bd218e d63487d9
Author: Jasper van Merle <jaspervmerle gmail com>
Date:   Sun Jun 30 00:08:50 2019 +0200

    Merge branch 'fix-firefox-preferences' into service-worker

 assets/javascripts/app/app.coffee                    |  2 ++
 assets/javascripts/app/settings.coffee               | 20 ++++++++++++++++++++
 .../javascripts/views/content/settings_page.coffee   | 10 +---------
 3 files changed, 23 insertions(+), 9 deletions(-)
---