Merge branch 'g4s'

This commit is contained in:
chicpro
2013-08-02 15:03:31 +09:00
2 changed files with 3 additions and 3 deletions

View File

@ -48,8 +48,8 @@ if (defined('G4_IS_ADMIN')) {
if (defined('_SHOP_')) $shop_css = '_shop';
echo '<link rel="stylesheet" href="'.G4_CSS_URL.'/'.(G4_IS_MOBILE?'mobile':'default').$shop_css.'.css">'.PHP_EOL;
}
// echo '<meta http-equiv="imagetoolbar" content="no">';
// echo '<meta http-equiv="X-UA-Compatible" content="IE=Edge" />';
echo '<meta http-equiv="imagetoolbar" content="no">';
echo '<meta http-equiv="X-UA-Compatible" content="IE=Edge">';
?>
<!--[if lte IE 8]>
<script src="<?php echo G4_JS_URL ?>/html5.js"></script>