Merge branch 'master' into adminlte-v3

# Conflicts: # Resources/public/adminlte.css # Resources/public/adminlte.js # Resources/public/entrypoints.json # Resources/public/fonts/fa-brands-400.eot # Resources/public/fonts/fa-brands-400.ttf # Resources/public/fonts/fa-brands-400.woff # Resources/public/fonts/fa-brands-400.woff2 # Resources/public/fonts/fa-regular-400.eot # Resources/public/fonts/fa-regular-400.ttf # Resources/public/fonts/fa-regular-400.woff # Resources/public/fonts/fa-regular-400.woff2 # Resources/public/fonts/fa-solid-900.eot # Resources/public/fonts/fa-solid-900.ttf # Resources/public/fonts/fa-solid-900.woff # Resources/public/fonts/fa-solid-900.woff2 # Resources/public/images/fa-brands-400.svg # Resources/public/images/fa-regular-400.svg # Resources/public/images/fa-solid-900.svg # Resources/public/manifest.json # yarn.lock
kevinpapst · kevinpapst · Jan 7, 2020 · Jan 7, 2020 · Jan 8, 2020 · Jan 8, 2020
commit 85798744b0c7a988e8ed107487a821915fc97acf
diff --git a/Resources/public/adminlte.css b/Resources/public/adminlte.css
diff --git a/Resources/public/adminlte.js b/Resources/public/adminlte.js
diff --git a/Resources/public/images/fa-brands-400.svg b/Resources/public/images/fa-brands-400.svg
diff --git a/Resources/public/images/fa-solid-900.svg b/Resources/public/images/fa-solid-900.svg