projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1e3aba5
b84df42
)
Merge branch '1943-client-sdk-config-files'
author
Tim Pierce <twp@curoverse.com>
Tue, 21 Jan 2014 22:14:40 +0000
(17:14 -0500)
committer
Tim Pierce <twp@curoverse.com>
Tue, 21 Jan 2014 22:14:40 +0000
(17:14 -0500)
Conflicts:
sdk/python/arvados/__init__.py
1
2
services/api/app/controllers/arvados/v1/schema_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/api/app/controllers/arvados/v1/schema_controller.rb
Simple merge
projects / arvados.git / commitdiff