e562b3cd02
Conflicts: css/theme.css header.php sass/theme.css.map sass/understrap/understrap.scss |
||
---|---|---|
.. | ||
bootstrap | ||
font-awesome | ||
owlcarousel | ||
theme | ||
underscores | ||
understrap | ||
theme.css.map | ||
theme.scss |