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: 60adf67 7d1e546)

author	Michael <heluecht@pirati.ca>
	Sun, 12 Mar 2017 20:54:28 +0000 (20:54 +0000)
committer	Michael <heluecht@pirati.ca>
	Sun, 12 Mar 2017 20:54:28 +0000 (20:54 +0000)
commit	1624150db4d0f511d7d119eb645e997bd3f76129
tree	4b5b4821e68812a602d145fe34da443f10d63e1b	tree \| snapshot
parent	60adf67f1392950b0aba3c589bed65c66058426d	commit \| diff
parent	7d1e54664a141919864e8b7dfa2ee4f4307fe6ad	commit \| diff

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

Conflicts:
include/onepoll.php

boot.php	diff1 \|	diff2 \|	blob \| history
include/Contact.php	diff1 \|	diff2 \|	blob \| history
include/dbstructure.php	diff1 \|	diff2 \|	blob \| history
include/onepoll.php	diff1 \|	diff2 \|	blob \| history
include/poller.php	diff1 \|	diff2 \|	blob \| history
include/socgraph.php	diff1 \|	diff2 \|	blob \| history
update.php	diff1 \|	diff2 \|	blob \| history

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