Merge pull request #3079 from Hypolite/issue/#3039-mod-3of3

author Michael Vogel <icarus@dabo.de>

Wed, 11 Jan 2017 21:33:41 +0000 (22:33 +0100)

committer GitHub <noreply@github.com>

Wed, 11 Jan 2017 21:33:41 +0000 (22:33 +0100)
author Michael Vogel <icarus@dabo.de>
Wed, 11 Jan 2017 21:33:41 +0000 (22:33 +0100)
committer GitHub <noreply@github.com>
Wed, 11 Jan 2017 21:33:41 +0000 (22:33 +0100)
diff --cc mod/wall_attach.php
Simple merge
diff --cc mod/wall_upload.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Wed, 11 Jan 2017 21:33:41 +0000 (22:33 +0100)
committer	GitHub <noreply@github.com>
	Wed, 11 Jan 2017 21:33:41 +0000 (22:33 +0100)
		1	2
mod/wall_attach.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/wall_upload.php	patch \|	diff1 \|	diff2 \|	blob \| history