fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-28 23:03:25 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/xpressengine/xe-core (1.8.14)

Browse source 
Conflicts:
	classes/context/Context.class.php
	modules/point/tpl/config.html
This commit is contained in:
Kijin Sung 2015-12-02 14:38:23 +09:00
commit a22e69b7ec
59 changed files with 249 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/editor/components/image_gallery/tpl/popup.min.css vendored
View file

File diff suppressed because one or more lines are too long

1
modules/editor/tpl/admin_index.html
View file

@ -213,3 +213,4 @@ jQuery(function($){
});
</script>
<div class="admin-forum-container" data-chak-categories="XE설정:에디터"></div>