Merge pull request #2748 from area-42/add_acl_for_mam_in_mod_muc

author Christophe Romain <cromain@users.noreply.github.com>

Thu, 10 Jan 2019 13:29:02 +0000 (14:29 +0100)

committer GitHub <noreply@github.com>

Thu, 10 Jan 2019 13:29:02 +0000 (14:29 +0100)
author Christophe Romain <cromain@users.noreply.github.com>
Thu, 10 Jan 2019 13:29:02 +0000 (14:29 +0100)
committer GitHub <noreply@github.com>
Thu, 10 Jan 2019 13:29:02 +0000 (14:29 +0100)
diff --cc src/mod_muc.erl
Simple merge
diff --cc src/mod_muc_admin.erl
Simple merge
diff --cc src/mod_muc_room.erl
Simple merge
author	Christophe Romain <cromain@users.noreply.github.com>
	Thu, 10 Jan 2019 13:29:02 +0000 (14:29 +0100)
committer	GitHub <noreply@github.com>
	Thu, 10 Jan 2019 13:29:02 +0000 (14:29 +0100)
		1	2
src/mod_muc.erl	patch \|	diff1 \|	diff2 \|	blob \| history
src/mod_muc_admin.erl	patch \|	diff1 \|	diff2 \|	blob \| history
src/mod_muc_room.erl	patch \|	diff1 \|	diff2 \|	blob \| history