]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into worker-class
authorMichael <heluecht@pirati.ca>
Sun, 5 Nov 2017 17:23:53 +0000 (17:23 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 5 Nov 2017 17:23:53 +0000 (17:23 +0000)
commit930309d2ecb8ed48f55408c9dddf9a3ec62731ab
tree256bbff301948b4a25f31d531122cc03dbaa7c9e
parent84c3c0753e10f267c6fa5b81a7130b0af167da9b
parent2f0005713f0edd667e2d926f3684eec7fcc7397b
Merge remote-tracking branch 'upstream/develop' into worker-class
include/items.php
mod/settings.php