git.mxchange.org Git - friendica.git/commit

]> git.mxchange.org Git - friendica.git/commit

projects / friendica.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4e02b80 a63e060)

author	Michael <heluecht@pirati.ca>
	Wed, 16 Nov 2016 06:27:21 +0000 (06:27 +0000)
committer	Michael <heluecht@pirati.ca>
	Wed, 16 Nov 2016 06:27:21 +0000 (06:27 +0000)
commit	126c4774c330d9c9c9038312198c57fb653682df
tree	10c6bd4f0118d84f1fc37b7b8edf6bfbd6abdc61	tree \| snapshot
parent	4e02b80868172d536ff975fffacf235004b0d2fc	commit \| diff
parent	a63e060b51609a78997134b612f372c2a4e07463	commit \| diff

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

Conflicts:
include/dbstructure.php
mod/item.php
mod/nodeinfo.php

include/Contact.php	diff1 \|	diff2 \|	blob \| history
include/dba.php	diff1 \|	diff2 \|	blob \| history
include/dbstructure.php	diff1 \|	diff2 \|	blob \| history
include/onepoll.php	diff1 \|	diff2 \|	blob \| history
mod/contacts.php	diff1 \|	diff2 \|	blob \| history
mod/network.php	diff1 \|	diff2 \|	blob \| history
mod/nodeinfo.php	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.