Commit graph

4 commits

Author SHA1 Message Date
m0namon
0af25a8e9b Return ancestor check in VirtualHost object 2020-01-16 09:19:36 -08:00
m0namon
47eaf83938 Additional fixes from merge 2020-01-16 09:17:23 -08:00
Joona Hoikkala
3b065238b3
Modifications needed for merging to master 2020-01-06 17:19:33 +02:00
Joona Hoikkala
0f5bda4ff9 Merge remote-tracking branch 'origin/master' into ap2_merge_master 2020-01-06 17:17:31 +02:00