projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9d9f657
1ec9e37
)
Merge branch 'master' into 6234-user-edit-self
author
radhika <radhika@curoverse.com>
Fri, 26 Jun 2015 14:34:33 +0000
(10:34 -0400)
committer
radhika <radhika@curoverse.com>
Fri, 26 Jun 2015 14:34:33 +0000
(10:34 -0400)
1
2
apps/workbench/test/integration/users_test.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/test/integration/users_test.rb
Simple merge