Merge remote-tracking branch 'origin/dev' into beta

1 files changed, 11 insertions, 8 deletions

diff --git a/constants.php b/constants.php
index 272647947..0c7adc57e 100644
--- a/constants.php
+++ b/constants.php
@@ -1,14 +1,17 @@
 <?php
-define('FRESHRSS_VERSION', '0.7-beta2');
+define('FRESHRSS_VERSION', '0.7-beta3');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 
 // Constantes de chemins
-define ('FRESHRSS_PATH', dirname(__FILE__));
+define('FRESHRSS_PATH', dirname(__FILE__));
 
-define ('PUBLIC_PATH', FRESHRSS_PATH . '/public');
-define ('DATA_PATH', FRESHRSS_PATH . '/data');
-define ('LIB_PATH', FRESHRSS_PATH . '/lib');
-define ('APP_PATH', FRESHRSS_PATH . '/app');
+	define('PUBLIC_PATH', FRESHRSS_PATH . '/p');
+		define('INDEX_PATH', PUBLIC_PATH . '/i');
+		define('PUBLIC_RELATIVE', '..');
 
-define ('LOG_PATH', DATA_PATH . '/log');
-define ('CACHE_PATH', DATA_PATH . '/cache');
+	define('DATA_PATH', FRESHRSS_PATH . '/data');
+		define('LOG_PATH', DATA_PATH . '/log');
+		define('CACHE_PATH', DATA_PATH . '/cache');
+
+	define('LIB_PATH', FRESHRSS_PATH . '/lib');
+		define('APP_PATH', FRESHRSS_PATH . '/app');