Jacob Cody Wimer 017f0dc1de Fixed merge conflict

2017-08-27 22:41:14 -04:00

..

tasks

Fixed merge conflict

2017-08-27 22:41:14 -04:00

templates

Make registry a unsecure repo on docker

2017-08-02 23:55:28 -04:00