projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
99ad159
83fc1e7
)
Merge branch 'master' into 4227-date-display
author
radhika <radhika@curoverse.com>
Wed, 22 Oct 2014 18:55:55 +0000
(14:55 -0400)
committer
radhika <radhika@curoverse.com>
Wed, 22 Oct 2014 18:55:55 +0000
(14:55 -0400)
Conflicts:
apps/workbench/test/integration/projects_test.rb
1
2
apps/workbench/test/integration/projects_test.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/test/integration/projects_test.rb
Simple merge
projects / arvados.git / commitdiff