Branch: refs/heads/release_16.07 Home: https://github.com/galaxyproject/galaxy Commit: 4d19755c1313e8a014f873f1b011baf4f8d59310 https://github.com/galaxyproject/galaxy/commit/4d19755c1313e8a014f873f1b011b... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-08-23 (Tue, 23 Aug 2016) Changed paths: A doc/source/admin/conda_faq.rst M doc/source/admin/index.rst Log Message: ----------- add conda docs converted and modified from IUC googledoc Commit: 01a24f6560be2d6cc9c6aef43e9665f140fc3640 https://github.com/galaxyproject/galaxy/commit/01a24f6560be2d6cc9c6aef43e966... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-08-23 (Tue, 23 Aug 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- rst problems Commit: 04f22b70a4ecd127e7990982c09db7278bf1cf98 https://github.com/galaxyproject/galaxy/commit/04f22b70a4ecd127e7990982c09db... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-08-23 (Tue, 23 Aug 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- fix plural, split lines to prevent indentation Commit: e33f8fe5b623d38ec7b27c90279713a18807ee48 https://github.com/galaxyproject/galaxy/commit/e33f8fe5b623d38ec7b27c9027971... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-08-23 (Tue, 23 Aug 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- replace apostrophes Commit: 453c98d8ad572b7d9154430f5f61123d7ca5fbc4 https://github.com/galaxyproject/galaxy/commit/453c98d8ad572b7d9154430f5f611... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-08-23 (Tue, 23 Aug 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- this one is even weirder than the ones before Commit: aedfdffafedd35a1ed52aec85dd373c76b7c3135 https://github.com/galaxyproject/galaxy/commit/aedfdffafedd35a1ed52aec85dd37... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-08-23 (Tue, 23 Aug 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- add more literal includes Commit: e52dbde3e481a30c5980f1e0171b720c557ee72d https://github.com/galaxyproject/galaxy/commit/e52dbde3e481a30c5980f1e0171b7... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-08-23 (Tue, 23 Aug 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- Conda/conda standardization Commit: b4495c1a8bb3e184bf35a9ebc4e795b7da3aadbb https://github.com/galaxyproject/galaxy/commit/b4495c1a8bb3e184bf35a9ebc4e79... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-08-23 (Tue, 23 Aug 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- Merge pull request #17 from dannon/docs_conda Conda/conda standardization Commit: 3d0bf645ab03585e316d673cd6b073e706fb616d https://github.com/galaxyproject/galaxy/commit/3d0bf645ab03585e316d673cd6b07... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- fix tiny things in docs Commit: 779c357dcac2940f9bdaacf8de5259fe632ada1c https://github.com/galaxyproject/galaxy/commit/779c357dcac2940f9bdaacf8de525... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- Merge branch 'docs_conda' of https://github.com/martenson/galaxy into docs_conda Commit: 124d546be6e789a288f19c21adb229e149e9d7d2 https://github.com/galaxyproject/galaxy/commit/124d546be6e789a288f19c21adb22... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: A doc/source/admin/conda_faq.rst M doc/source/admin/index.rst Log Message: ----------- Merge pull request #2844 from martenson/docs_conda [16.07] add conda docs converted and modified from IUC googledoc Compare: https://github.com/galaxyproject/galaxy/compare/a1b2ec386e32...124d546be6e7