]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach
authorMichael <heluecht@pirati.ca>
Thu, 13 Jul 2017 20:38:18 +0000 (20:38 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 13 Jul 2017 20:38:18 +0000 (20:38 +0000)
commit181947f774c878f806a72de391fbab7fb5b273f5
tree9efe3ad98071d14760f93f6ee3cc58a74db2ef4f
parent910cca06291365d5b8f425dcf0217a452327dea5
parent86934119b1bcfac1c68d65154ce11e463a21e0af
Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach

Conflicts:
include/text.php
include/text.php