Merge branch 'develop' into pr/utf8mb4

Conflicts:
	tests/Install/AutoinstallCept.php
This commit is contained in:
Kijin Sung 2016-01-11 20:03:55 +09:00
commit e572b81b8a
42 changed files with 77 additions and 6133 deletions

View file

@ -28,7 +28,7 @@ $install_config = array(
'db_userid' => $dbinfo['user'],
'db_password' => $dbinfo['password'],
'db_database' => $dbinfo['dbname'],
'db_table_prefix' =>'xe_',
'db_table_prefix' =>'rx',
'db_charset' => 'utf8',
'use_rewrite' =>'N',
'time_zone' =>'0900',