Merge pull request #747 from MrPetovan/bug/mastodoncustomemojis-fix-notice

author Michael Vogel <icarus@dabo.de>

Fri, 12 Oct 2018 12:57:47 +0000 (14:57 +0200)

committer GitHub <noreply@github.com>

Fri, 12 Oct 2018 12:57:47 +0000 (14:57 +0200)
author Michael Vogel <icarus@dabo.de>
Fri, 12 Oct 2018 12:57:47 +0000 (14:57 +0200)
committer GitHub <noreply@github.com>
Fri, 12 Oct 2018 12:57:47 +0000 (14:57 +0200)
diff --cc mastodoncustomemojis/mastodoncustomemojis.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Fri, 12 Oct 2018 12:57:47 +0000 (14:57 +0200)
committer	GitHub <noreply@github.com>
	Fri, 12 Oct 2018 12:57:47 +0000 (14:57 +0200)