merge from seeddms-4.1.2

This commit is contained in:
Uwe Steinmann 2013-04-08 08:18:19 +02:00
parent 26798d7676
commit d88e907086

View File

@ -20,11 +20,7 @@
class SeedDMS_Version {
<<<<<<< HEAD
var $_number = "4.2.0";
=======
var $_number = "4.1.2";
>>>>>>> seeddms-4.1.2
var $_string = "SeedDMS";
function SeedDMS_Version() {