]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master' into develop
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 6 Jun 2017 10:20:55 +0000 (12:20 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 6 Jun 2017 10:20:55 +0000 (12:20 +0200)
commitf3d8da7d3303b72e7b775498663a57501bfc49c2
tree71b141701d61000753df01543db725223d039fc7
parent0cc15f5c3d80af9b334b14390f04bd9ba0548354
parente3f60fe70620f49d8dddc8ee95b420f0e399ab06
Merge branch 'master' into develop
include/dbstructure.php
include/diaspora.php
include/poller.php