2 commits

Author	SHA1	Message	Date
Henry Jameson	0be86304d2	Fix tests, more replacing with mergedConfig	2019-10-06 23:28:30 +03:00
shpuld	3978aaef84	Redo everything in the MR	2019-01-26 17:45:03 +02:00