]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1704-mastodon
authorMichael <heluecht@pirati.ca>
Thu, 20 Apr 2017 05:44:31 +0000 (05:44 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 20 Apr 2017 05:44:31 +0000 (05:44 +0000)
commit3592f909105d09ac7d4d7bfebe47f4b3921763d6
tree99449c0405346ffa34a5f247a44a99921026ddce
parentc6e7f6306c3475ff8d4f06e90b661929abf613a0
parentd3cdfa610852f5dbda9bc3e29df6524eb504d068
Merge remote-tracking branch 'upstream/develop' into 1704-mastodon

Conflicts:
include/bbcode.php
include/bbcode.php
include/ostatus.php