Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Becker <halfdan@xnorfz.de>2013-04-12 20:19:06 +0400
committerFabian Becker <halfdan@xnorfz.de>2013-04-12 20:19:06 +0400
commit70b5bc29b6ace702300fbeb0720155f71aa592a8 (patch)
treea2160fa1f5ac171c18bfaefab118680cec929caf /plugins/Widgetize
parentb8c9b3773f0c430ce83acd9e0c4f62b3df382a53 (diff)
parent5444603da9e3ed24517ef51bef1c55d656efe6b0 (diff)
Merge branch 'master' into 2.x-twig
Conflicts: plugins/CoreAdminHome/templates/header.tpl plugins/Widgetize/templates/iframe.tpl
Diffstat (limited to 'plugins/Widgetize')
-rw-r--r--plugins/Widgetize/templates/iframe.twig6
1 files changed, 0 insertions, 6 deletions
diff --git a/plugins/Widgetize/templates/iframe.twig b/plugins/Widgetize/templates/iframe.twig
index c63939bfac..6a6ec59e75 100644
--- a/plugins/Widgetize/templates/iframe.twig
+++ b/plugins/Widgetize/templates/iframe.twig
@@ -17,11 +17,5 @@
<div class="widget">
{{ content|raw }}
</div>
-
- <script type="text/javascript">
- $(document).ready(function () {
- broadcast.init();
- });
- </script>
</body>
</html>