projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9214af a7d558d)
Merge branch '6090-docker-use-local-sso' closes #6138
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 27 May 2015 18:23:03 +0000 (14:23 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 27 May 2015 18:23:03 +0000 (14:23 -0400)
1  2 
services/api/db/structure.sql patch | diff1 | diff2 | blob | history

diff --cc services/api/db/structure.sql
Simple merge