diff options
author | Fabian Becker <halfdan@xnorfz.de> | 2013-04-12 20:19:06 +0400 |
---|---|---|
committer | Fabian Becker <halfdan@xnorfz.de> | 2013-04-12 20:19:06 +0400 |
commit | 70b5bc29b6ace702300fbeb0720155f71aa592a8 (patch) | |
tree | a2160fa1f5ac171c18bfaefab118680cec929caf /plugins/Widgetize | |
parent | b8c9b3773f0c430ce83acd9e0c4f62b3df382a53 (diff) | |
parent | 5444603da9e3ed24517ef51bef1c55d656efe6b0 (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.twig | 6 |
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> |