Merge branch 'g5'

2014-01-17 11:22:41 +09:00
parent c3bfa2355c e46cdb41fc
commit 3e8dbb207a
14 changed files with 72 additions and 34 deletions
--- a/head.sub.php
+++ b/head.sub.php
@ -41,6 +41,9 @@ if (G5_IS_MOBILE) {
    echo '<meta http-equiv="imagetoolbar" content="no">'.PHP_EOL;
    echo '<meta http-equiv="X-UA-Compatible" content="IE=10,chrome=1">'.PHP_EOL;
 }
+
+if($config['cf_add_meta'])
+    echo $config['cf_add_meta'].PHP_EOL;
 ?>
 <title><?php echo $g5_head_title; ?></title>
 <?php