Merge branch 'g5'

This commit is contained in:
chicpro
2013-10-02 12:57:06 +09:00
28 changed files with 418 additions and 559 deletions

View File

@ -87,7 +87,6 @@ if ($is_admin) {
<script src="<?php echo G5_JS_URL ?>/wrest.js"></script>
<?php
if(G5_IS_MOBILE) {
echo '<script> set_cookie("device_width", $(window).width(), 6, g5_cookie_domain); </script>'.PHP_EOL;
echo '<script src="'.G5_JS_URL.'/modernizr.custom.70111.js"></script>'.PHP_EOL; // overflow scroll 감지
}
//if(!defined('G5_IS_ADMIN'))