Merge remote-tracking branch 'upstream/develop' into private
authorMichael <heluecht@pirati.ca>
Mon, 2 Mar 2020 15:05:00 +0000 (15:05 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 2 Mar 2020 15:05:00 +0000 (15:05 +0000)
commit72c198990e3d6dd23628ad15600b2089882e03c4
tree3cf25ea9412af24b6184d30f6d246e8d4b9029a7
parentd3c6f6de2a9128e2ef68c34ca551e692d503961f
parente008811514ba79ed5fe2c06d6e7a01d4092acb6f
Merge remote-tracking branch 'upstream/develop' into private
include/api.php
mod/settings.php
src/Content/Text/BBCode.php
src/Model/Item.php
src/Model/Term.php
src/Object/Post.php
src/Protocol/ActivityPub/Processor.php
src/Protocol/ActivityPub/Receiver.php
src/Protocol/ActivityPub/Transmitter.php
src/Protocol/Diaspora.php
view/theme/frio/templates/settings/settings.tpl