clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1701-performance

This commit is contained in:
Michael 2017-02-02 06:27:10 +00:00
parent 9a19ae7ce1 2f00683b77
commit 5ffef9c96d
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -40,7 +40,7 @@ define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_CODENAME', 'Asparagus'); define ( 'FRIENDICA_CODENAME', 'Asparagus');
define ( 'FRIENDICA_VERSION', '3.5.1-dev' ); define ( 'FRIENDICA_VERSION', '3.5.1-dev' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1213 ); define ( 'DB_UPDATE_VERSION', 1214 );
/** /**
* @brief Constant with a HTML line break. * @brief Constant with a HTML line break.

1
include/dbstructure.php
View File

@ -1040,6 +1040,7 @@ function db_definition($charset) {
"parent-uri" => array("parent-uri"), "parent-uri" => array("parent-uri"),
"extid" => array("extid"), "extid" => array("extid"),
"uid_id" => array("uid","id"), "uid_id" => array("uid","id"),
"uid_contactid_id" => array("uid","contact-id","id"),
"uid_created" => array("uid","created"), "uid_created" => array("uid","created"),
"uid_unseen_contactid" => array("uid","unseen","contact-id"), "uid_unseen_contactid" => array("uid","unseen","contact-id"),
"uid_network_received" => array("uid","network","received"), "uid_network_received" => array("uid","network","received"),

2
update.php
View File

@ -1,6 +1,6 @@
<?php <?php
define('UPDATE_VERSION' , 1213); define('UPDATE_VERSION' , 1214);
/** /**
* *