Merge toto/main and preserve local changes (window controls, extensio…#29

Toto672 wants to merge 2 commits into

thibautrey:mainthibautrey/chaton:mainfrom

Toto672:mainToto672/chaton:mainCopy head branch name to clipboard