webpack.mix.js · e3ea8c537d450663edb65fc285b4969724352d55 · open-source / MetaGer

4 years ago

Merge branch 'development' into '932-dark-stylesheet-alternative' · 8828d367

Phil Höfer authored 4 years ago

# Conflicts:
#   resources/less/metager/pages/resultpage/result-page.less
#   resources/less/metager/pages/resultpage/result.less
#   resources/less/metager/variables.less
#   webpack.mix.js

8828d367

History

Merge branch 'development' into '932-dark-stylesheet-alternative'

Phil Höfer authored 4 years ago

# Conflicts:
#   resources/less/metager/pages/resultpage/result-page.less
#   resources/less/metager/pages/resultpage/result.less
#   resources/less/metager/variables.less
#   webpack.mix.js