Update config sample and collab doc#3039

Merged

khassel merged 2 commits into

MagicMirrorOrg:developfrom

rejas:misc/config_sample

Feb 17, 2023

Commits on Feb 17, 2023

Remove old information from config sample
veeck
committed
Add note about mastermerge label, update CHANGELOG
veeck
committed