Merge pull request #7828 from nupplaphil/task/move_enotify

author Hypolite Petovan <hypolite@mrpetovan.com>

Sat, 9 Nov 2019 21:48:26 +0000 (16:48 -0500)

committer GitHub <noreply@github.com>

Sat, 9 Nov 2019 21:48:26 +0000 (16:48 -0500)
author Hypolite Petovan <hypolite@mrpetovan.com>
Sat, 9 Nov 2019 21:48:26 +0000 (16:48 -0500)
committer GitHub <noreply@github.com>
Sat, 9 Nov 2019 21:48:26 +0000 (16:48 -0500)
diff --cc database.sql
Simple merge
diff --cc static/dbstructure.config.php
Simple merge
author	Hypolite Petovan <hypolite@mrpetovan.com>
	Sat, 9 Nov 2019 21:48:26 +0000 (16:48 -0500)
committer	GitHub <noreply@github.com>
	Sat, 9 Nov 2019 21:48:26 +0000 (16:48 -0500)
		1	2
database.sql	patch \|	diff1 \|	diff2 \|	blob \| history
static/dbstructure.config.php	patch \|	diff1 \|	diff2 \|	blob \| history