resolved merge conflicts

1 files changed, 3 insertions, 1 deletions

diff --git a/js/codeq/core.js b/js/codeq/core.js
index ef3648f..01382d1 100644
--- a/js/codeq/core.js
+++ b/js/codeq/core.js
@@ -391,5 +391,7 @@
         codeq.setLang(lang || 'en'); // initial language setting
         // go to login
         codeq.globalStateMachine.transition('login');
-    });
+
+        //For performance reasons, the Tooltip and Popover data-apis are opt-in, meaning you must initialize them yourself.
+        $('[data-toggle="popover"]').popover()});
 })();