Commit 2fa78730 authored by Joshua's avatar Joshua

Merge branch 'master' of https://git.willers.digital/Dennis.Willers/tabu-middleware

 Conflicts:
	events.js
parents 942762da f709d779
Pipeline #296 passed with stages
in 2 minutes and 31 seconds