Branch: refs/heads/release_16.01 Home: https://github.com/galaxyproject/galaxy Commit: cfb8ed32693d6aad0ef26af7af7171e0e8c3ee04 https://github.com/galaxyproject/galaxy/commit/cfb8ed32693d6aad0ef26af7af717... Author: carlfeberhard carlfeberhard@gmail.com Date: 2016-04-19 (Tue, 19 Apr 2016)
Changed paths: M client/galaxy/scripts/mvc/citation/citation-model.js M static/maps/mvc/citation/citation-model.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/citation/citation-model.js
Log Message: ----------- UI, citations: fix bad merge from 15.10
774487d created a difference between the imported name and the one used.
Commit: 3737fc9487ad25ba09960e0d7858d4c15a3087bf https://github.com/galaxyproject/galaxy/commit/3737fc9487ad25ba09960e0d7858d... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-04-19 (Tue, 19 Apr 2016)
Changed paths: M client/galaxy/scripts/mvc/citation/citation-model.js M static/maps/mvc/citation/citation-model.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/citation/citation-model.js
Log Message: ----------- Merge pull request #2198 from carlfeberhard/fix.citations-again
[16.01] UI, citations: fix bad merge from 15.10
Compare: https://github.com/galaxyproject/galaxy/compare/e2f88296f845...3737fc9487ad
galaxy-commits@lists.galaxyproject.org