oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-12 01:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/develop' into 1702-null-date

Browse source 
Conflicts:
	include/onepoll.php
This commit is contained in:
Michael 2017-03-12 20:54:28 +00:00
commit 1624150db4
27 changed files with 13447 additions and 13110 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/dbstructure.php
View file

@ -1526,6 +1526,7 @@ function db_definition($charset) {
"uid_contactid_created" => array("uid","contact-id","created"),
"uid_created" => array("uid","created"),
"uid_commented" => array("uid","commented"),
"uid_wall_created" => array("uid","wall","created"),
)
);
$database["tokens"] = array(