Merge branch 'master' into develop

hassankhan · Feb 17, 2014 · 06b28fe · 06b28fe
2 parents 272ab09 + 1e8caa6
commit 06b28fe
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/config.php b/config.php
@@ -18,7 +18,8 @@
         'nav'               => array(
             'class'             => 'nav',
             'dropdown_li_class' => 'dropdown',
-            'dropdown_ul_class' => 'dropdown-menu'
+            'dropdown_ul_class' => 'dropdown-menu',
+            'dropdown_li_markup' => '<li class="%s"><a href="%s" class="dropdown-toggle" data-toggle="dropdown"> %s <b class="caret"></b></a><ul class="%s">'
         )
     ),
     'twig' => array(