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

Merge branch 'xpressengine/master' into develop

Browse source 
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
This commit is contained in:
Kijin Sung 2016-02-18 20:01:52 +09:00
commit 6ab309c8c4
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/constants.php
View file

@ -3,7 +3,7 @@
/** /**
* RX_VERSION is the version number of the Rhymix CMS. * RX_VERSION is the version number of the Rhymix CMS.
*/ */
define('RX_VERSION', '1.8.15'); define('RX_VERSION', '1.8.16');
/** /**
* RX_MICROTIME is the startup time of the current script, in microseconds since the Unix epoch. * RX_MICROTIME is the startup time of the current script, in microseconds since the Unix epoch.

2
modules/layout/tpl/layout_modify.html
View file

@ -1,3 +1,3 @@
<load target="js/layout_modify.js" /> <load target="js/layout_modify.js" />
<include target="header.html" /> <include target="header.html" />
{$content} {$content}