7709: Merge branch 'master' into 7709-api-rails4
authorTom Clegg <tom@curoverse.com>
Tue, 25 Apr 2017 05:14:23 +0000 (01:14 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 25 Apr 2017 05:14:23 +0000 (01:14 -0400)
commit3ef580c47029ff0fbf959b044f29c183f41cb609
tree2263ca63effa72eaf3ee5178a857c7edc1c5566b
parentde083a9fec0ca08afda5a9369c6cd32dbdcd0965
parentbf5d77baad2071af6eea514c76b4892cec4974a0
7709: Merge branch 'master' into 7709-api-rails4

Conflicts:
services/api/db/structure.sql
services/api/db/structure.sql