projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ac5a69c
9c3dd1f
)
Merge remote-tracking branch 'origin/master' into 2049-run-job-from-workbench
author
Peter Amstutz <peter.amstutz@curoverse.com>
Tue, 4 Mar 2014 15:52:00 +0000
(10:52 -0500)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Tue, 4 Mar 2014 15:52:00 +0000
(10:52 -0500)
1
2
apps/workbench/app/assets/stylesheets/application.css.scss
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/assets/stylesheets/application.css.scss
Simple merge