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
faceoff_migration
filter
images
img
js	Fix layout_modify.js to submit type=color contents.	2016-02-07 19:26:37 +09:00
after_upload_config_image.html
copy_layout.html
faceoff_layout_edit.html
faceoff_layout_menu.html	class 명을 기존 jPicker 와 달리 써서 충돌 회피	2016-02-06 18:46:02 +09:00
faceOff_sample.tar	XE표기를 Rhymix로 변경	2016-01-25 18:10:15 +09:00
header.html	Fix #248 missing index.html in manual link	2016-02-11 15:31:51 +09:00
installed_layout_list.html	forum chak 제거	2016-02-18 17:17:43 +09:00
layout_all_instance_list.html	forum chak 제거	2016-02-18 17:17:43 +09:00
layout_edit.html	forum chak 제거	2016-02-18 17:17:43 +09:00
layout_html_css_view.html
layout_info_view.html	Fix layout_modify.js to submit type=color contents.	2016-02-07 19:26:37 +09:00
layout_instance_list.html	forum chak 제거	2016-02-18 17:17:43 +09:00
layout_modify.html	Merge branch 'xpressengine/master' into develop	2016-02-18 20:01:52 +09:00
layout_preview.html	Initial implementation of auto-minify	2016-01-07 13:54:47 +09:00
sub_tab.html
top_refresh.html