]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn
authorMichael Vogel <icarus@dabo.de>
Mon, 25 Jan 2016 22:51:11 +0000 (23:51 +0100)
committerMichael Vogel <icarus@dabo.de>
Mon, 25 Jan 2016 22:51:11 +0000 (23:51 +0100)
commit4208acf4b6bda77e729d18f4fd931ae97aad08ef
treec6c7f92a2ce29264c6e293c4012417bcd2e6c0f6
parent778d9250c699962a1f9907322756b81d24032fa3
parent7ea3923429a0525e44dd5d87aecfc4ad62aa3619
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn
include/Contact.php
include/cron.php
include/onepoll.php