Adapt to removal of Singleton

This commit is contained in:
Alexander Bock
2018-11-05 14:17:42 -05:00
parent a130b0b7a0
commit cf593bd060
13 changed files with 98 additions and 23 deletions