Merge branch 'master' of git://github.com/friendika/friendika
This commit is contained in:
commit
0e8b2092a0
|
@ -27,7 +27,7 @@ exchange conversations
|
||||||
encryption support
|
encryption support
|
||||||
- PHP *command line* access with register_argc_argv set to true in the
|
- PHP *command line* access with register_argc_argv set to true in the
|
||||||
php.ini file
|
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
|
- some form of email server or email gateway such that PHP mail() works
|
||||||
- mcrypt (optional; used for end-to-end message encryption)
|
- mcrypt (optional; used for end-to-end message encryption)
|
||||||
|
|
||||||
|
|
2
boot.php
2
boot.php
|
@ -4,7 +4,7 @@ set_time_limit(0);
|
||||||
ini_set('pcre.backtrack_limit', 250000);
|
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 ( 'DFRN_PROTOCOL_VERSION', '2.21' );
|
||||||
define ( 'DB_UPDATE_VERSION', 1060 );
|
define ( 'DB_UPDATE_VERSION', 1060 );
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue