Merged with test (branches diverged, rebase would be pain i.t.a.)

4e6cdc9f · jarmil · ecf3df14 · 3395a2c5 · 4e6cdc9f · 4e6cdc9f
Commit 4e6cdc9f authored 4 years ago by jarmil
--- a/green_deal/static/green_deal/node_modules/vegas/dist/overlays/09.png
+++ b/green_deal/static/green_deal/node_modules/vegas/dist/overlays/09.png
--- a/green_deal/static/green_deal/node_modules/vegas/dist/overlays/16.png
+++ b/green_deal/static/green_deal/node_modules/vegas/dist/overlays/16.png
--- a/green_deal/static/green_deal/vendor/css/jquery-ui.min.css
+++ b/green_deal/static/green_deal/vendor/css/jquery-ui.min.css
--- a/green_deal/static/green_deal/vendor/css/lightgallery.min.css
+++ b/green_deal/static/green_deal/vendor/css/lightgallery.min.css
--- a/green_deal/static/green_deal/vendor/css/vegas.min.css
+++ b/green_deal/static/green_deal/vendor/css/vegas.min.css
--- a/green_deal/static/green_deal/vendor/js/cookieconsent.min.js
+++ b/green_deal/static/green_deal/vendor/js/cookieconsent.min.js
--- a/green_deal/static/green_deal/vendor/js/jquery-ui.min.js
+++ b/green_deal/static/green_deal/vendor/js/jquery-ui.min.js
--- a/green_deal/static/green_deal/vendor/js/jquery.mousewheel.min.js
+++ b/green_deal/static/green_deal/vendor/js/jquery.mousewheel.min.js
--- a/green_deal/static/green_deal/vendor/js/lg-fullscreen.min.js
+++ b/green_deal/static/green_deal/vendor/js/lg-fullscreen.min.js
--- a/green_deal/static/green_deal/vendor/js/lg-thumbnail.min.js
+++ b/green_deal/static/green_deal/vendor/js/lg-thumbnail.min.js
--- a/green_deal/static/green_deal/vendor/js/lg-video.min.js
+++ b/green_deal/static/green_deal/vendor/js/lg-video.min.js
--- a/green_deal/static/green_deal/vendor/js/lightgallery.min.js
+++ b/green_deal/static/green_deal/vendor/js/lightgallery.min.js
--- a/green_deal/static/green_deal/vendor/js/vegas.min.js
+++ b/green_deal/static/green_deal/vendor/js/vegas.min.js
--- a/green_deal/templates/green_deal/base.html
+++ b/green_deal/templates/green_deal/base.html
--- a/green_deal/templates/green_deal/content_section.html
+++ b/green_deal/templates/green_deal/content_section.html
--- a/green_deal/templates/green_deal/green_deal_home_page.html
+++ b/green_deal/templates/green_deal/green_deal_home_page.html
--- a/green_deal/templates/green_deal/green_deal_sub_page.html
+++ b/green_deal/templates/green_deal/green_deal_sub_page.html
--- a/majak/settings/base.py
+++ b/majak/settings/base.py
--- a/regulace_konopi/migrations/0003_auto_20201129_1705.py
+++ b/regulace_konopi/migrations/0003_auto_20201129_1705.py
--- a/regulace_konopi/migrations/0004_auto_20201212_1937.py
+++ b/regulace_konopi/migrations/0004_auto_20201212_1937.py