projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 047cd9b 7bd1598)
Merge branch '14196-api-v2-tokens' refs #14196
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Tue, 9 Oct 2018 19:20:38 +0000 (15:20 -0400)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Tue, 9 Oct 2018 19:20:38 +0000 (15:20 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

1  2 
services/api/test/test_helper.rb patch | diff1 | diff2 | blob | history

diff --cc services/api/test/test_helper.rb
Simple merge