Merge branch 'master' into 13864-Virtual-machines 13864-Virtual-machines
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 27 Nov 2018 09:09:28 +0000 (10:09 +0100)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 27 Nov 2018 09:09:28 +0000 (10:09 +0100)
commit95b86eb6b3184b787b570a906347ccaac32195c6
tree37b12fdfa79a7bf89594488784e8679a72e78add
parentefbf87610d0d483416a14a5364a5f8c61bdee10b
parent0a08341c1d88b3f47d6fda46ecd9110d45aaea1d
Merge branch 'master' into 13864-Virtual-machines

refs #13864

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
src/models/resource.ts