Merge pull request #5789 from friendica/master

author Hypolite Petovan <hypolite@mrpetovan.com>

Sun, 23 Sep 2018 22:55:20 +0000 (18:55 -0400)

committer GitHub <noreply@github.com>

Sun, 23 Sep 2018 22:55:20 +0000 (18:55 -0400)
author Hypolite Petovan <hypolite@mrpetovan.com>
Sun, 23 Sep 2018 22:55:20 +0000 (18:55 -0400)
committer GitHub <noreply@github.com>
Sun, 23 Sep 2018 22:55:20 +0000 (18:55 -0400)
diff --cc mod/message.php
Simple merge
diff --cc src/Model/Item.php
Simple merge
diff --cc view/theme/frio/js/modal.js
Simple merge
author	Hypolite Petovan <hypolite@mrpetovan.com>
	Sun, 23 Sep 2018 22:55:20 +0000 (18:55 -0400)
committer	GitHub <noreply@github.com>
	Sun, 23 Sep 2018 22:55:20 +0000 (18:55 -0400)
		1	2
mod/message.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Model/Item.php	patch \|	diff1 \|	diff2 \|	blob \| history
view/theme/frio/js/modal.js	patch \|	diff1 \|	diff2 \|	blob \| history