Merge branch 'master' into develop

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 9df56318819b9d9e12f407b994ab3007da5b1337..ab510949370a89d54ff0d7a7310f6b8740d2c5ad 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -38,8 +38,8 @@ use Friendica\Util\DateTimeFormat;
 require_once 'include/text.php';
 
 define('FRIENDICA_PLATFORM',     'Friendica');
-define('FRIENDICA_CODENAME',     'Asparagus');
-define('FRIENDICA_VERSION',      '3.6-dev');
+define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
+define('FRIENDICA_VERSION',      '3.6');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
 define('DB_UPDATE_VERSION',      1256);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);