Branch: refs/heads/release_16.07 Home: https://github.com/galaxyproject/galaxy Commit: 375ed8cc81590a18a52b61e32307562488fd551e https://github.com/galaxyproject/galaxy/commit/375ed8cc81590a18a52b61e323075... Author: Martin Cech cech.marten@gmail.com Date: 2016-10-03 (Mon, 03 Oct 2016)

Changed paths: M doc/source/admin/conda_faq.rst

Log Message: ----------- polish resolvers section in conda faq docs

Commit: ba274e37f2f0e8c9973b19c46fe99c5565c5118c https://github.com/galaxyproject/galaxy/commit/ba274e37f2f0e8c9973b19c46fe99... Author: Martin Cech cech.marten@gmail.com Date: 2016-10-03 (Mon, 03 Oct 2016)

Changed paths: M doc/source/admin/conda_faq.rst

Log Message: ----------- describe the conda installation behavior a bit better

Commit: 2899372791fdbba4f8db7c414a5447cf049987f3 https://github.com/galaxyproject/galaxy/commit/2899372791fdbba4f8db7c414a544... Author: Nicola Soranzo nsoranzo@tiscali.it Date: 2016-10-03 (Mon, 03 Oct 2016)

Changed paths: M doc/source/admin/conda_faq.rst

Log Message: ----------- Update conda_faq.rst

Commit: fdfe9d8c20a63e6e6e6951d5fe5cbd7d74446d0a https://github.com/galaxyproject/galaxy/commit/fdfe9d8c20a63e6e6e6951d5fe5cb... Author: Martin Cech cech.marten@gmail.com Date: 2016-10-03 (Mon, 03 Oct 2016)

Changed paths: M doc/source/admin/conda_faq.rst

Log Message: ----------- Merge pull request #19 from martenson/nsoranzo-patch-1-1

Small fixes to conda_faq.rst changes

Commit: d9fab3345856770a16a98f18cf9e6185a4eae91a https://github.com/galaxyproject/galaxy/commit/d9fab3345856770a16a98f18cf9e6... Author: Nicola Soranzo nsoranzo@tiscali.it Date: 2016-10-03 (Mon, 03 Oct 2016)

Changed paths: M doc/source/admin/conda_faq.rst

Log Message: ----------- Merge pull request #2998 from martenson/conda-faq-polish

[16.07] Conda FAQ polish

Compare: https://github.com/galaxyproject/galaxy/compare/04d62e242412...d9fab3345856