Merge branch 'dev' into 411-update-system

Conflicts:
	constants.php

1 files changed, 1 insertions, 0 deletions

diff --git a/constants.php b/constants.php
index ba9c508dc..4c515d121 100644
--- a/constants.php
+++ b/constants.php
@@ -2,6 +2,7 @@
 define('FRESHRSS_VERSION', '0.8-dev');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_UPDATE_WEBSITE', 'https://update.freshrss.org?v=' . FRESHRSS_VERSION);
+define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
 // PHP text output compression http://php.net/ob_gzhandler (better to do it at Web server level)
 define('PHP_COMPRESSION', false);