]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'develop' of https://github.com/friendica/friendica into develop
authorRalf Thees <ralf@herrthees.de>
Sun, 23 Sep 2018 12:06:17 +0000 (14:06 +0200)
committerRalf Thees <ralf@herrthees.de>
Sun, 23 Sep 2018 12:06:17 +0000 (14:06 +0200)
1  2 
mod/message.php
view/theme/frio/js/modal.js

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