Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 0187b7f5e09566fde582997ab142627adfc9ebfc https://github.com/galaxyproject/galaxy/commit/0187b7f5e09566fde582997ab1426... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-04-27 (Wed, 27 Apr 2016)

Changed paths: M lib/galaxy/webapps/tool_shed/model/__init__.py

Log Message: ----------- Use standard model.orm.now for toolshed's password reset token datetime math

Commit: 898588a4d5718e6f711659b2f6a226bb77bc03dd https://github.com/galaxyproject/galaxy/commit/898588a4d5718e6f711659b2f6a22... Author: Björn Grüning bjoern@gruenings.eu Date: 2016-04-27 (Wed, 27 Apr 2016)

Changed paths: M lib/galaxy/webapps/tool_shed/model/__init__.py

Log Message: ----------- Merge pull request #2261 from dannon/prt_now

Use standard model.orm.now for toolshed's password reset token dateti…

Compare: https://github.com/galaxyproject/galaxy/compare/881c149f5a61...898588a4d571