Bug 962149 - [E-Mail][UI] HTML cache saves/serializes edit mode state
Bug 948307 - [DSDS] SIM manager is loaded about half second later
Merge pull request #15439 from EragonJ/bug-948307-another-try

Bug 948307 - [DSDS] SIM manager is loaded about half second later
Merge pull request #15572 from jrburke/bug962149-email-nopersist-edit

Bug 962149 - [E-Mail][UI] HTML cache saves/serializes edit mode state r=asuth
Bug 962257 - [B2G][Email][Browser] Link navigates to blank screen when sharing an email link in browser
Bug 960502 - [Everything.me] Limit query parameter length [r=ranbena]
Bug 929172 - gaia unit tests broken in b2g desktop due to fast CSP enhancement r=yurenju

* registers special /common and /shared directories
* changes httpd.js to handle correctly registered directories
* changes the test-agent boilerplate to always use the test's hostname
* add a NO_LOCK_SCREEN env variable for disabling the lockscreen at build time
* add a "unit tests in b2g" travis job
* This simplifies also how localization is done
* enable the Promise object in all DEBUG=1 profiles
Merge pull request #15530 from EverythingMe/960502-trunc-query

Bug 960502 - [Everything.me] Limit query parameter length to 128 [r=ranbena]
[B2G][Email] POP3 account creation hangs when an incorrect password is used with a POP3 server that immediately disconnects on incorrect password (ex: aol.com POP3 server). r=asuth
WIP - Mass reenable email tests
Merge pull request #15585 from gaye/email-mass-reenable

WIP - Mass reenable email tests
Revert "Merge pull request #15585 from gaye/email-mass-reenable"

This reverts commit 67828ef861a77e991cb0e2739973925ac82d7658, reversing
changes made to 55b1b6d56afbfd13a3ae05e530a5511b5831ea9f.
Merge pull request #15586 from gaye/i-am-so-sorry

Revert "Merge pull request #15585 from gaye/email-mass-reenable"
Bug 937431 - [Tooling] make jshint a requirement on pre-commit r=rik

* changes how `make lint` works
* introduces a jshint-blacklisted reporter
* changes the pre-commit hook to run both jshint and gjslint
* changes the linters Travis jobs
* remove all predefined globals from the main .jshintrc default global
* add new jshintrc files for subdirectories
* add a README file in build/jshint/
Merge pull request #15583 from mcav/pop3-conn-drop

[B2G][Email] POP3 account creation hangs when an incorrect password is used with a POP3 server that immediately disconnects on incorrect password (ex: aol.com POP3 server). r=asuth
Bug 962486 - [regression] customization tool doesn't work
Merge pull request #15581 from jrburke/bug962257-email-link-blank

Bug 962257 - [B2G][Email][Browser] Link navigates to blank screen when s... r=asuth
Merge pull request #15591 from yurenju/bug962486

Bug 962486 - [regression] customization tool doesn't work r=@timdream
Merge branch 'master' of git://github.com/mozilla-b2g/gaia into issue-958440