From: Mikael Nordfeldth <mmn@hethane.se>
Date: Fri, 27 Feb 2015 09:04:29 +0000 (+0100)
Subject: Change branch to 1.2.x since we're utf8mb4 now
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4e26527447852f88d48bf40a4f208079fcb77a49;p=quix0rs-gnu-social.git

Change branch to 1.2.x since we're utf8mb4 now
---

diff --git a/lib/framework.php b/lib/framework.php
index 30b98d259f..d3b59cf111 100644
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -22,12 +22,12 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 define('GNUSOCIAL_ENGINE', 'GNU social');
 define('GNUSOCIAL_ENGINE_URL', 'https://www.gnu.org/software/social/');
 
-define('GNUSOCIAL_BASE_VERSION', '1.1.3');
-define('GNUSOCIAL_LIFECYCLE', 'release'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('GNUSOCIAL_BASE_VERSION', '1.2.0');
+define('GNUSOCIAL_LIFECYCLE', 'dev'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
 
 define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE);
 
-define('GNUSOCIAL_CODENAME', 'The Spanish Invasion');
+define('GNUSOCIAL_CODENAME', 'Not decided yet');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);