Merge branch 'master' into 9687-container-request-display
authorLucas Di Pentima <lucas@curoverse.com>
Tue, 30 Aug 2016 19:37:48 +0000 (16:37 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Tue, 30 Aug 2016 19:37:48 +0000 (16:37 -0300)
commit3678eda6ea138d948919944d1b54e680ba20ea81
treeded358e20b57d2a18dc172abe7be985775d48028
parenta3b87eea221b1c169fd1e953c8263e63646a2da1
parent7497b21c937bb6e8451f16047945b7cfc9081a53
Merge branch 'master' into 9687-container-request-display
apps/workbench/app/models/container_work_unit.rb
apps/workbench/app/models/work_unit.rb
services/api/test/fixtures/container_requests.yml