GitHub PushEvent at 2014-02-18 11:03:05
Repository: faq.local
Actor: duongbq
Payload: {"shas":[["b01c2ae9e23d3df0950a39f9a83fa2345f79365b","7952deb9a0252a95e6f019ce58a04006fd14fd2f@duongbq-PC","Merge origin/master\n\nConflicts:\n\t.htaccess\n\tapplication/.htaccess\n\tapplication/cache/.htaccess\n\tapplication/cache/index.html\n\tapplication/config/autoload.php\n\tapplication/config/config.php\n\tapplication/config/constants.php\n\tapplication/config/database.php\n\tapplication/config/doctypes.php\n\tapplication/config/foreign_chars.php\n\tapplication/config/hooks.php\n\tapplication/config/index.html\n\tapplication/config/mimes.php\n\tapplication/config/profiler.php\n\tapplication/config/routes.php\n\tapplication/config/smileys.php\n\tapplication/config/user_agents.php\n\tapplication/controllers/index.html\n\tapplication/core/index.html\n\tapplication/errors/error_404.php\n\tapplication/errors/error_db.php\n\tapplication/errors/error_general.php\n\tapplication/errors/error_php.php\n\tapplication/errors/index.html\n\tapplication/hooks/index.html\n\tapplication/index.html\n\tapplication/third_party/index.html\n\tapplication/views/index.html\n\tindex.php\n\tsystem/.htaccess\n\tsystem/core/CodeIgniter.php\n\tsystem/core/Common.php\n\tsystem/core/Config.php\n\tsystem/core/Controller.php\n\tsystem/core/Input.php\n\tsystem/core/Loader.php\n\tsystem/core/Security.php\n\tsystem/core/Utf8.php\n\tsystem/core/index.html\n\tsystem/database/DB_active_rec.php\n\tsystem/database/DB_cache.php\n\tsystem/database/DB_driver.php\n\tsystem/database/DB_forge.php\n\tsystem/database/DB_result.php\n\tsystem/database/DB_utility.php\n\tsystem/database/drivers/cubrid/cubrid_driver.php\n\tsystem/database/drivers/cubrid/cubrid_forge.php\n\tsystem/database/drivers/cubrid/cubrid_result.php\n\tsystem/database/drivers/cubrid/cubrid_utility.php\n\tsystem/database/drivers/cubrid/index.html\n\tsystem/database/drivers/index.html\n\tsystem/database/drivers/mssql/index.html\n\tsystem/database/drivers/mssql/mssql_driver.php\n\tsystem/database/drivers/mssql/mssql_forge.php\n\tsystem/database/drivers/mssql/mssql_result.php\n\tsystem/database/drivers/mssql/mssql_utility.php\n\tsystem/database/drivers/mysql/index.html\n\tsystem/database/drivers/mysql/mysql_driver.php\n\tsystem/database/drivers/mysql/mysql_forge.php\n\tsystem/database/drivers/mysql/mysql_result.php\n\tsystem/database/drivers/mysql/mysql_utility.php\n\tsystem/database/drivers/mysqli/index.html\n\tsystem/database/drivers/mysqli/mysqli_driver.php\n\tsystem/database/drivers/mysqli/mysqli_forge.php\n\tsystem/database/drivers/mysqli/mysqli_result.php\n\tsystem/database/drivers/mysqli/mysqli_utility.php\n\tsystem/database/drivers/oci8/index.html\n\tsystem/database/drivers/oci8/oci8_driver.php\n\tsystem/database/drivers/oci8/oci8_forge.php\n\tsystem/database/drivers/oci8/oci8_result.php\n\tsystem/database/drivers/oci8/oci8_utility.php\n\tsystem/database/drivers/odbc/index.html\n\tsystem/database/drivers/odbc/odbc_driver.php\n\tsystem/database/drivers/odbc/odbc_forge.php\n\tsystem/database/drivers/odbc/odbc_result.php\n\tsystem/database/drivers/odbc/odbc_utility.php\n\tsystem/database/drivers/pdo/index.html\n\tsystem/database/drivers/pdo/pdo_driver.php\n\tsystem/database/drivers/pdo/pdo_forge.php\n\tsystem/database/drivers/pdo/pdo_result.php\n\tsystem/database/drivers/pdo/pdo_utility.php\n\tsystem/database/drivers/postgre/index.html\n\tsystem/database/drivers/postgre/postgre_driver.php\n\tsystem/database/drivers/postgre/postgre_forge.php\n\tsystem/database/drivers/postgre/postgre_result.php\n\tsystem/database/drivers/postgre/postgre_utility.php\n\tsystem/database/drivers/sqlite/index.html\n\tsystem/database/drivers/sqlite/sqlite_driver.php\n\tsystem/database/drivers/sqlite/sqlite_forge.php\n\tsystem/database/drivers/sqlite/sqlite_result.php\n\tsystem/database/drivers/sqlite/sqlite_utility.php\n\tsystem/database/drivers/sqlsrv/index.html\n\tsystem/database/drivers/sqlsrv/sqlsrv_driver.php\n\tsystem/database/drivers/sqlsrv/sqlsrv_forge.php\n\tsystem/database/drivers/sqlsrv/sqlsrv_result.php\n\tsystem/database/drivers/sqlsrv/sqlsrv_utility.php\n\tsystem/database/index.html\n\tsystem/fonts/index.html\n\tsystem/fonts/texb.ttf\n\tsystem/helpers/array_helper.php\n\tsystem/helpers/captcha_helper.php\n\tsystem/helpers/cookie_helper.php\n\tsystem/helpers/date_helper.php\n\tsystem/helpers/directory_helper.php\n\tsystem/helpers/download_helper.php\n\tsystem/helpers/email_helper.php\n\tsystem/helpers/file_helper.php\n\tsystem/helpers/form_helper.php\n\tsystem/helpers/html_helper.php\n\tsystem/helpers/index.html\n\tsystem/helpers/inflector_helper.php\n\tsystem/helpers/language_helper.php\n\tsystem/helpers/number_helper.php\n\tsystem/helpers/path_helper.php\n\tsystem/helpers/security_helper.php\n\tsystem/helpers/smiley_helper.php\n\tsystem/helpers/string_helper.php\n\tsystem/helpers/text_helper.php\n\tsystem/helpers/typography_helper.php\n\tsystem/helpers/url_helper.php\n\tsystem/helpers/xml_helper.php\n\tsystem/index.html\n\tsystem/language/english/calendar_lang.php\n\tsystem/language/english/date_lang.php\n\tsystem/language/english/db_lang.php\n\tsystem/language/english/email_lang.php\n\tsystem/language/english/form_validation_lang.php\n\tsystem/language/english/ftp_lang.php\n\tsystem/language/english/imglib_lang.php\n\tsystem/language/english/index.html\n\tsystem/language/english/migration_lang.php\n\tsystem/language/english/number_lang.php\n\tsystem/language/english/profiler_lang.php\n\tsystem/language/english/unit_test_lang.php\n\tsystem/language/english/upload_lang.php\n\tsystem/language/index.html\n\tsystem/libraries/Cache/Cache.php\n\tsystem/libraries/Cache/drivers/Cache_apc.php\n\tsystem/libraries/Cache/drivers/Cache_dummy.php\n\tsystem/libraries/Cache/drivers/Cache_file.php\n\tsystem/libraries/Cache/drivers/Cache_memcached.php\n\tsystem/libraries/Calendar.php\n\tsystem/libraries/Cart.php\n\tsystem/libraries/Driver.php\n\tsystem/libraries/Email.php\n\tsystem/libraries/Encrypt.php\n\tsystem/libraries/Form_validation.php\n\tsystem/libraries/Ftp.php\n\tsystem/libraries/Image_lib.php\n\tsystem/libraries/Javascript.php\n\tsystem/libraries/Log.php\n\tsystem/libraries/Migration.php\n\tsystem/libraries/Pagination.php\n\tsystem/libraries/Parser.php\n\tsystem/libraries/Profiler.php\n\tsystem/libraries/Session.php\n\tsystem/libraries/Sha1.php\n\tsystem/libraries/Table.php\n\tsystem/libraries/Trackback.php\n\tsystem/libraries/Typography.php\n\tsystem/libraries/Unit_test.php\n\tsystem/libraries/Upload.php\n\tsystem/libraries/User_agent.php\n\tsystem/libraries/Xmlrpc.php\n\tsystem/libraries/Xmlrpcs.php\n\tsystem/libraries/Zip.php\n\tsystem/libraries/index.html\n\tsystem/libraries/javascript/Jquery.php","duongbq",true]],"size":1,"ref":"refs/heads/master","head":"b01c2ae9e23d3df0950a39f9a83fa2345f79365b"}