John Chilton aee38feeb4 Merge remote-tracking branch 'galaxyproject/dev' into gie-generic ...

Conflicts:
	static/maps/layout/menu.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/layout/menu.js

2016-04-04 13:00:21 -04:00

..

masthead.js

Merge 16.01, rebuild.

2016-03-23 12:39:06 -04:00

menu.js

Merge remote-tracking branch 'galaxyproject/dev' into gie-generic

2016-04-04 13:00:21 -04:00

modal.js

Webpack: move old school modal into layout/

2015-11-12 10:59:25 -05:00

page.js

Fix scratchbook

2016-03-22 14:19:58 -04:00

panel.js

(merge dev)

2015-12-02 12:00:51 -05:00

scratchbook.js

Re-add identifiers to masthead, new ones for scratchbook (thanks @guerler)

2016-01-05 14:04:22 -05:00