antelle dd68aa342a Merge branch 'develop' into usb ... # Conflicts: # app/scripts/const/default-app-settings.js # app/scripts/views/open-view.js		2020-04-23 20:26:52 +02:00
..
settings-about-view.js	fix #1323: version in the About dialog	2019-10-26 22:56:36 +02:00
settings-devices-view.js	tooling check	2020-04-19 20:42:55 +02:00
settings-file-view.js	escaping more dangerous places	2020-04-23 19:55:52 +02:00
settings-general-view.js	option to log out from storages	2020-04-17 21:36:56 +02:00
settings-help-view.js	escaping dangerous places	2020-04-23 20:06:10 +02:00
settings-logs-view.js	moved views	2019-09-16 20:42:33 +02:00
settings-plugins-view.js	fix #1323: version in the About dialog	2019-10-26 22:56:36 +02:00
settings-prv-view.js	moved views	2019-09-16 20:42:33 +02:00
settings-shortcuts-view.js	fix #1324: duplicated shortcut editor in settings	2019-10-27 09:10:00 +01:00
settings-view.js	events	2019-09-16 22:57:56 +02:00