Scott Nonnenberg 53d7761e43 Merge branch 'master' into development

2017-12-06 12:45:26 -08:00

..

auto_update.js

Delay our call to quitAndInstall(); doesn't work inside callback (#1866)

2017-12-06 12:44:23 -08:00

config.js

Beta versions support: SxS support, in-app env/instance display (#1606)

2017-10-30 13:57:13 -07:00

locale.js

Ensure locale is 'en' when NODE_ENV=test (#1527)

2017-10-03 11:08:06 -07:00

logging.js

Logging for prekey fetches, load of log files (#1836)

2017-11-30 11:56:46 -08:00

menu.js

Added top level menu shortcuts, pull labels from messages.json (#1702)

2017-11-07 15:14:20 -08:00

tray_icon.js

Add a tray icon to the application (#1676)

2017-11-27 14:48:09 -08:00

user_config.js

Beta versions support: SxS support, in-app env/instance display (#1606)

2017-10-30 13:57:13 -07:00

window_state.js

Refactor external source files to live in app/

2017-09-14 16:53:50 -07:00