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)
commit306688057d64a156969eff79fff546c82d8e616a
tree49e39b6baa264392a90348d795253449c2dd07ac
parent91f405bac4ae94bc883ab1dd32df468fc7eae324
parentfe0856e794117984d2ff46b58fb4307fad55bc80
Merge branch 'develop' of https://github.com/friendica/friendica into develop
mod/message.php
view/theme/frio/js/modal.js