Merge branch '11807-yaml-to-json'
authorTom Clegg <tom@curoverse.com>
Fri, 30 Jun 2017 18:30:34 +0000 (14:30 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 30 Jun 2017 18:30:34 +0000 (14:30 -0400)
refs #11807

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

1  2 
services/api/db/structure.sql

Simple merge