Kijin Sung 6ab309c8c4 Merge branch 'xpressengine/master' into develop ... Conflicts: classes/context/Context.class.php classes/security/Purifier.class.php config/config.inc.php libs/phpmailer/phpmailer.php modules/admin/tpl/_header.html modules/admin/tpl/config_ftp.html modules/communication/communication.controller.php modules/layout/tpl/layout_modify.html modules/module/module.model.php		2016-02-18 20:01:52 +09:00
..
css	Fix broken pre-wrap on debug entries	2016-02-16 13:10:41 +09:00
defaults	Move whitelist file to common location	2016-02-16 15:27:41 +09:00
framework	Never allow warnings to be printed before headers	2016-02-16 16:35:29 +09:00
img	merge from 1.7.3.5(r13153:r13167)	2013-09-29 23:32:39 +00:00
js	Clean up common_layout.html and merge with mobile_layout.html	2016-02-17 16:20:57 +09:00
lang	Clean up common_layout.html and merge with mobile_layout.html	2016-02-17 16:20:57 +09:00
libraries	Add more libraries	2016-01-20 14:15:59 +09:00
manual	Fix inconsistent capitalization of Rhymix	2016-02-08 16:31:10 +09:00
tpl	Clean up common_layout.html and merge with mobile_layout.html	2016-02-17 16:20:57 +09:00
autoload.php	Fix E_STRICT errors being displayed in PHP 5.3	2016-02-17 11:44:32 +09:00
constants.php	Merge branch 'xpressengine/master' into develop	2016-02-18 20:01:52 +09:00
functions.php	Fix typo in comment for config() function	2016-02-16 13:20:27 +09:00
legacy.php	Merge pull request #278 from kijin/pr/fix-csrf-false-positive	2016-02-16 14:34:53 +09:00