Merge pull request #5789 from friendica/master
authorHypolite Petovan <hypolite@mrpetovan.com>
Sun, 23 Sep 2018 22:55:20 +0000 (18:55 -0400)
committerGitHub <noreply@github.com>
Sun, 23 Sep 2018 22:55:20 +0000 (18:55 -0400)
Update develop from master-2019.09

1  2 
mod/message.php
src/Model/Item.php
view/theme/frio/js/modal.js

diff --cc mod/message.php
Simple merge
Simple merge
Simple merge