Richard de Boer 8d6dec8712 Merge branch 'master' into data_files ... # Conflicts: # apps/setting/ChangeLog # apps/widbatpc/ChangeLog		2020-04-20 12:00:25 +02:00
..
ChangeLog	Merge branch 'master' into data_files	2020-04-20 12:00:25 +02:00
settings.js	Merge branch 'master' into data_files	2020-04-20 12:00:25 +02:00
widget.js	Merge branch 'master' into data_files	2020-04-20 12:00:25 +02:00
widget.png	Copied widbat changes to new widget	2020-04-02 08:34:47 +01:00