antelle 66b2b77791 Merge branch 'develop' into usb ... # Conflicts: # app/scripts/models/app-settings-model.js # desktop/app.js		2020-04-18 11:03:06 +02:00
..
areas	Merge branch 'develop' into usb	2020-04-18 11:03:06 +02:00
base	fix #1457: fixed styles in theme plugins	2020-04-15 17:12:02 +02:00
common	prettier	2019-09-09 17:07:24 +02:00
themes	organized files inside util	2019-09-15 08:11:11 +02:00
utils	fix #1006: password generator patterns	2020-03-15 11:20:01 +01:00
main.scss	fix #1006: password generator patterns	2020-03-15 11:20:01 +01:00