You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Scott Nonnenberg 53d7761e43 Merge branch 'master' into development		7 years ago
..
auto_update.js	Delay our call to quitAndInstall(); doesn't work inside callback (#1866)	7 years ago
config.js	Beta versions support: SxS support, in-app env/instance display (#1606)	8 years ago
locale.js	Ensure locale is 'en' when NODE_ENV=test (#1527)	8 years ago
logging.js	Logging for prekey fetches, load of log files (#1836)	7 years ago
menu.js	Added top level menu shortcuts, pull labels from messages.json (#1702)	8 years ago
tray_icon.js	Add a tray icon to the application (#1676)	8 years ago
user_config.js	Beta versions support: SxS support, in-app env/instance display (#1606)	8 years ago
window_state.js	Refactor external source files to live in app/	8 years ago