Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: e703f798aa6e2586d5b3481ef830f4b3d0cf6d83 https://github.com/galaxyproject/usegalaxy-playbook/commit/e703f798aa6e2586d... Author: Nate Coraor nate@bx.psu.edu Date: 2016-09-23 (Fri, 23 Sep 2016)

Changed paths: M files/galaxy/usegalaxy.org/config/job_resource_params_conf.xml M templates/galaxy/usegalaxy.org/config/job_conf.xml.j2

Log Message: ----------- Bridges for Main