diff options
author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-05 04:59:13 +0200 |
---|---|---|
committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-05 04:59:13 +0200 |
commit | 0e8b2092a0c30a8eb898a8f0e7130251300e8d47 (patch) | |
tree | c031604fa09ffaee480c746fc62d6814819f4e43 | |
parent | ebb8186191d46f6b264d09f886d5574761194685 (diff) | |
parent | 05e06889b313a7a870f5ef4d374c043b5950ef77 (diff) | |
download | volse-hubzilla-0e8b2092a0c30a8eb898a8f0e7130251300e8d47.tar.gz volse-hubzilla-0e8b2092a0c30a8eb898a8f0e7130251300e8d47.tar.bz2 volse-hubzilla-0e8b2092a0c30a8eb898a8f0e7130251300e8d47.zip |
Merge branch 'master' of git://github.com/friendika/friendika
-rw-r--r-- | INSTALL.txt | 2 | ||||
-rw-r--r-- | boot.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/INSTALL.txt b/INSTALL.txt index 8de306b7d..32de0309c 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -27,7 +27,7 @@ exchange conversations encryption support - PHP *command line* access with register_argc_argv set to true in the php.ini file - - curl, gd, mysql, and openssl extensions + - curl, gd, mysql, mbstring, and openssl extensions - some form of email server or email gateway such that PHP mail() works - mcrypt (optional; used for end-to-end message encryption) @@ -4,7 +4,7 @@ set_time_limit(0); ini_set('pcre.backtrack_limit', 250000); -define ( 'FRIENDIKA_VERSION', '2.2.999' ); +define ( 'FRIENDIKA_VERSION', '2.2.1001' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1060 ); |