Nicola Soranzo a57b4c1715 Merge branch 'release_17.05' into dev ...

Conflicts:
	static/maps/mvc/tool/tool-form-base.js.map
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/mvc/tool/tool-form-base.js

2017-06-27 03:25:44 +02:00

..

gmaj

…

images

…

jqtouch

…

laj

…

maps

Merge branch 'release_17.05' into dev

2017-06-27 03:25:44 +02:00

patmat

…

scripts

Merge branch 'release_17.05' into dev

2017-06-27 03:25:44 +02:00

style

Revise panel/iframe handling, align naming, rely on empty to trigger removal of previous view

2017-06-19 15:48:28 -04:00

toolshed

…

wymeditor

…

favicon.ico

…

formatHelp.html

…

GruntFile.js

Merge remote-tracking branch 'guerler/remove_custom_builds_mako' into dev

2017-04-05 10:51:56 -04:00

GruntFile.js.map

Merge remote-tracking branch 'guerler/remove_custom_builds_mako' into dev

2017-04-05 10:51:56 -04:00

incompatible-browser.html

…

june_2007_style

…

robots.txt

…

src

…

user_disabled.html

…

welcome.html.sample

Rebase

2017-06-01 16:43:21 +00:00