Merge branch 'convert_to_reseller' into 'master'

Marius Cramer

2014-08-14 c56175b5781ee8a20bebe3015bcbe8ea68b9c8b7

 interface/lib/config.inc.php

@@ -44,7 +44,7 @@

//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
define('ISPC_APP_VERSION', '3.0.5.4dev');
define('ISPC_APP_VERSION', '3.1dev');
define('DEVSYSTEM', 0);