Skip to content

Commit

Permalink
Merge branch 'better-js-loading' into dev
Browse files Browse the repository at this point in the history
# 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
  • Loading branch information
nikeo committed Mar 14, 2020
2 parents da36339 + 9173dc5 commit 3575f31
Show file tree
Hide file tree
Showing 106 changed files with 62,316 additions and 40,153 deletions.
2 changes: 1 addition & 1 deletion assets/back/js/czr-hs-doc.min.js

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

2 changes: 1 addition & 1 deletion assets/back/js/czr_post_formats.min.js

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

Loading

0 comments on commit 3575f31

Please sign in to comment.