Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: d86ee3706089e59868c16a3352ce61e0257dbb40 https://github.com/galaxyproject/galaxy/commit/d86ee3706089e59868c16a3352ce6... Author: Rémi Marenco <remi.marenco@gmail.com> Date: 2016-08-29 (Mon, 29 Aug 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- Add the <conda_prefix> in 12. and fix typo I am adding the ``<conda_prefix>/envs`` to check for the package to have been properly installed (if people have brought their own Conda). And fixing ``conda_prefix`` to stay consistent in the doc (``<conda_prefix>``). Commit: 579ea41085501139eebbbeb5b3f72c9c04c03e4c https://github.com/galaxyproject/galaxy/commit/579ea41085501139eebbbeb5b3f72... Author: Rémi Marenco <remi.marenco@gmail.com> Date: 2016-08-30 (Tue, 30 Aug 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- Update Marius advice Commit: e6450369730230bc844db67d3df05f1cffd3cdad https://github.com/galaxyproject/galaxy/commit/e6450369730230bc844db67d3df05... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-08-30 (Tue, 30 Aug 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- Merge pull request #2871 from remimarenco/patch-8 Add the <conda_prefix> in 12. and fix typo Compare: https://github.com/galaxyproject/galaxy/compare/dbde38c951cd...e64503697302