projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
38b9c64
51f5653
)
Merge remote-tracking branch 'origin/master' into 2042-new-collection-from-selected...
author
Peter Amstutz <peter.amstutz@curoverse.com>
Thu, 6 Mar 2014 20:55:19 +0000
(15:55 -0500)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Thu, 6 Mar 2014 20:55:19 +0000
(15:55 -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