Merge remote-tracking branch 'origin/feat/templated-sourcehook' into feat/templated-sourcehook

Sometimes my vast intellect... it scares me.

# Conflicts:
#	core/provider/source/provider_source.cpp
This commit is contained in:
Mooshua 2024-04-23 23:14:29 -07:00
commit e391dc5b14

Diff Content Not Available