fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 18:21:39 +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/addon/tpl/addon_list.html
View file

@ -61,3 +61,5 @@
</div>
</div>
</form>
<div class="admin-forum-container" data-chak-categories="XE설정:애드온"></div>

2
modules/addon/tpl/setup_addon.html
View file

@ -120,3 +120,5 @@
});
})(jQuery);
</script>
<div class="admin-forum-container" data-chak-categories="XE설정:애드온"></div>