projects / arvados.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 80ab788 20ffc96)
2872: Merge branch 'master' into 2872-folder-nav
authorTom Clegg <tom@curoverse.com>
Thu, 5 Jun 2014 15:17:59 +0000 (11:17 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 5 Jun 2014 15:17:59 +0000 (11:17 -0400)
commit7df2da959b583d3646b9fde606f9e74d598d4bb9
tree9fafc5350b0450fcf638215073bc699eed80cf17tree | snapshot
parent80ab788943653194282c6a61cebc871f7944958fcommit | diff
parent20ffc9676259b048a0cd08df8a54063e885b9f3ecommit | diff
2872: Merge branch 'master' into 2872-folder-nav

Conflicts:
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/helpers/application_helper.rb
apps/workbench/app/models/authorized_key.rb
apps/workbench/app/models/job.rb
apps/workbench/app/models/pipeline_instance.rb
apps/workbench/app/models/user.rb
apps/workbench/app/models/virtual_machine.rb
apps/workbench/app/assets/stylesheets/application.css.scss diff1 | diff2 | blob | history
apps/workbench/app/models/pipeline_instance.rb diff1 | diff2 | blob | history
apps/workbench/test/integration/pipeline_instances_test.rb diff1 | diff2 | blob | history