gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-04 15:12:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.1.4' into develop

Browse Source 
Conflicts:
	install/install.php
This commit is contained in:
Uwe Steinmann 2013-04-16 22:31:52 +02:00
commit a8f3c7be59
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SeedDMS_Core/package.xml
View File

@ -12,8 +12,8 @@
<email>uwe@steinmann.cx</email>
<active>yes</active>
</lead>
<date>2013-04-08</date>
<time>16:45:06</time>
<date>2013-04-16</date>
<time>22:24:26</time>
<version>
<release>4.2.0</release>
<api>4.2.0</api>

4
install/install.php
View File

@ -116,11 +116,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
* Load default settings + set
*/
define("SEEDDMS_INSTALL", "on");
<<<<<<< HEAD
define("SEEDDMS_VERSION", "4.2.0");
=======
define("SEEDDMS_VERSION", "4.1.2");
>>>>>>> seeddms-4.1.2
require_once('../inc/inc.ClassSettings.php');