projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
31a61e3
1b8caff
)
Merge branch 'master' into 6676-document-sso
author
Peter Amstutz <peter.amstutz@curoverse.com>
Fri, 31 Jul 2015 14:31:11 +0000
(10:31 -0400)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Fri, 31 Jul 2015 14:31:11 +0000
(10:31 -0400)
Trivial merge