Branch: refs/heads/revert-2139-fix-inactivity Home: https://github.com/galaxyproject/galaxy Commit: b0ac297536681545637bf5c7a0084a0af907a40b https://github.com/galaxyproject/galaxy/commit/b0ac297536681545637bf5c7a0084... Author: carlfeberhard carlfeberhard@users.noreply.github.com Date: 2016-04-12 (Tue, 12 Apr 2016)

Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js

Log Message: ----------- Revert "[16.01] load options from config, not from options"