merge -c2848 from branch 2.0 to trunk

bug fixed: in r2774 a bug was introduced, piwigo.org is not available yet,
and plugin manager can't connect to the extension manager.


git-svn-id: http://piwigo.org/svn/trunk@2849 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2008-11-08 20:42:50 +00:00
parent dd6d5474d9
commit 30e97931af
+1 -1
View File
@@ -23,7 +23,7 @@
// Default settings
define('PHPWG_VERSION', 'Colibri');
define('PHPWG_DOMAIN', 'piwigo.org');
define('PHPWG_DOMAIN', 'phpwebgallery.net');
define('PHPWG_URL', 'http://www.'.PHPWG_DOMAIN);
define('PEM_URL', 'http://' . PHPWG_DOMAIN . '/ext_new'); /* need to be changed on final release */
define('PHPWG_DEFAULT_LANGUAGE', 'en_UK');