Branch: refs/heads/release_18.01 Home: https://github.com/galaxyproject/galaxy Commit: 7d81d2cfcba070558dbb1cb5e7b5be390e797ff3 https://github.com/galaxyproject/galaxy/commit/7d81d2cfcba070558dbb1cb5e7b5b... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-04-26 (Thu, 26 Apr 2018) Changed paths: M config/local_conda_mapping.yml.sample M doc/source/admin/cluster.md Log Message: ----------- Fix 2 typos in the docs Commit: d5ec01d5da1dfde88090afec6df958dfa98af21c https://github.com/galaxyproject/galaxy/commit/d5ec01d5da1dfde88090afec6df95... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2018-04-26 (Thu, 26 Apr 2018) Changed paths: M config/local_conda_mapping.yml.sample M doc/source/admin/cluster.md Log Message: ----------- Merge pull request #5986 from nsoranzo/release_17.09_doc_fixes [17.09] Fix 2 typos in the docs Commit: a3e69636662cfeae0ebc1b66fcc03b0b7fe13be8 https://github.com/galaxyproject/galaxy/commit/a3e69636662cfeae0ebc1b66fcc03... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-04-26 (Thu, 26 Apr 2018) Changed paths: M config/local_conda_mapping.yml.sample M doc/source/admin/cluster.md Log Message: ----------- Merge branch 'release_17.09' into release_18.01 Compare: https://github.com/galaxyproject/galaxy/compare/1b1962ea490c...a3e69636662c