Branch: refs/heads/release_18.01 Home: https://github.com/galaxyproject/galaxy Commit: 3ab2afb5e5bd82b3aa89500b9c2f80913a054316 https://github.com/galaxyproject/galaxy/commit/3ab2afb5e5bd82b3aa89500b9c2f8... Author: Anthony Bretaudeau anthony.bretaudeau@inria.fr Date: 2018-04-23 (Mon, 23 Apr 2018)
Changed paths: M lib/galaxy/tools/data_manager/manager.py
Log Message: ----------- backport move_merge fix from #5922
Commit: 20e9934bc5922f8d20dd31540a4dce9086495832 https://github.com/galaxyproject/galaxy/commit/20e9934bc5922f8d20dd31540a4dc... Author: John Chilton jmchilton@gmail.com Date: 2018-04-24 (Tue, 24 Apr 2018)
Changed paths: M lib/galaxy/tools/data_manager/manager.py
Log Message: ----------- Merge pull request #5958 from abretaud/movemerge1801
[18.01] Backport to 18.01 the move_merge fix from #5922
Compare: https://github.com/galaxyproject/galaxy/compare/88bf6bbdaa2d...20e9934bc592