projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4e62496
587fcc9
)
Merge branch 'master' into 3618-column-ordering
author
Phil Hodgson <bitbucket@philhodgson.net>
Fri, 24 Oct 2014 12:06:45 +0000
(14:06 +0200)
committer
Phil Hodgson <bitbucket@philhodgson.net>
Fri, 24 Oct 2014 12:06:45 +0000
(14:06 +0200)
1
2
apps/workbench/app/assets/javascripts/infinite_scroll.js
patch
|
diff1
|
diff2
|
blob
|
history
apps/workbench/app/assets/stylesheets/application.css.scss
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/assets/javascripts/infinite_scroll.js
Simple merge
diff --cc
apps/workbench/app/assets/stylesheets/application.css.scss
Simple merge
projects / arvados.git / commitdiff