aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2011-12-23 22:40:04 -0800
committerfriendica <info@friendica.com>2011-12-23 22:40:04 -0800
commit202725e671bab0d2f54319cfbb5351d80d9c5bd6 (patch)
tree2d724d44988db823c1f358c85106865d68c3561d
parent310527e0615bd6ec4254911bd9484139df30f945 (diff)
parentfc90323cd24be3b6dfabd0a6f3ba1ad61b8e22ea (diff)
downloadvolse-hubzilla-202725e671bab0d2f54319cfbb5351d80d9c5bd6.tar.gz
volse-hubzilla-202725e671bab0d2f54319cfbb5351d80d9c5bd6.tar.bz2
volse-hubzilla-202725e671bab0d2f54319cfbb5351d80d9c5bd6.zip
Merge branch 'master' into notify
-rw-r--r--boot.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index 2c12ed508..7c60c11ad 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1203' );
+define ( 'FRIENDICA_VERSION', '2.3.1204' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1112 );