Merge remote branch 'upstream/master'

This commit is contained in:
jennylee
2014-04-29 13:16:24 -04:00

View File

@@ -1,4 +1,7 @@
<head>
<!-- translations -->
<script type="text/javascript" src="{$translationMafe}"></script>
{if $isDebugMode}
<!-- files that are built into pmui.css-->
{foreach from=$pmuiCssCacheFile item=file}
@@ -64,8 +67,7 @@
<script type="text/javascript" src="/lib/js/mafe-{$buildhash}.js"></script>
{/if}
<!-- translations -->
<script type="text/javascript" src="{$translationMafe}"></script>
</head>
<body onresize="resizingFrame();">