Adding lost ability to auto-merge & overwrite themes#686

Merged

robinweser merged 1 commit intomasterfrom

theme-provider-merge-overwrite

Mar 7, 2019

Commits on Mar 6, 2019

readd lost ability to auto-merge and overwrite themes
rofrischmann
committed

⚡