Commit 3575f31

nikeo

committed

Merge branch 'better-js-loading' into dev

# Conflicts: # assets/front/css/_dev/style-rtl-without-bootstrap.css # assets/front/css/_dev/style-rtl-without-bootstrap.css.map # assets/front/css/_dev/style-without-bootstrap.css # assets/front/css/_dev/style-without-bootstrap.css.map # assets/front/css/rtl.css # assets/front/css/style.css # assets/front/css/style.min.css

2 parents da36339 + 9173dc5 commit 3575f31Copy full SHA for 3575f31

106 files changed

+62316

-40153

lines changed

assets
core
grunt-tasks-config
- uglify.js
- watch.js
inc
- assets
- lang
package-lock.json
package.json
readme.md
readme.txt
style.css

106 files changed

+62316

-40153

lines changed

`‎assets/back/js/czr-hs-doc.min.js`

+1-1

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

`‎assets/back/js/czr_post_formats.min.js`

+1-1

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Comments

(0)