Kijin Sung a22e69b7ec Merge branch 'develop' of https://github.com/xpressengine/xe-core (1.8.14) ... Conflicts: classes/context/Context.class.php modules/point/tpl/config.html		2015-12-02 14:38:23 +09:00
..
emoticon	Merge #1636 이모티콘 컴포넌트 리사이징 개선 PR by misol	2015-10-08 15:03:23 +09:00
image_gallery	Merge branch 'develop' of https://github.com/xpressengine/xe-core (1.8.14)	2015-12-02 14:38:23 +09:00
image_link	Merge #1363 PHP 5 방식의 생성자 (__construct) 사용 by kijin	2015-10-08 14:10:32 +09:00
poll_maker	Merge #1363 PHP 5 방식의 생성자 (__construct) 사용 by kijin	2015-10-08 14:10:32 +09:00