Merge remote-tracking branch 'origin/master'

# Conflicts: # css/child-theme.css # js/popper.js # package.json # style.css
understrap · Aug 17, 2017 · 774c912 · 774c912
2 parents 38375f7 + 2059f07
commit 774c912
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/functions.php b/functions.php
@@ -17,5 +17,7 @@ function theme_enqueue_styles() {
 	$the_theme = wp_get_theme();
 
     wp_enqueue_style( 'child-understrap-styles', get_stylesheet_directory_uri() . '/css/child-theme.min.css', array(), $the_theme->get( 'Version' ) );
+    wp_enqueue_script( 'jquery' );
+	wp_enqueue_script( 'popper-scripts', get_template_directory_uri() . '/js/popper.min.js', array(), false);
     wp_enqueue_script( 'child-understrap-scripts', get_stylesheet_directory_uri() . '/js/child-theme.min.js', array(), $the_theme->get( 'Version' ), true );
 }