cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into redesign

Browse source 
Conflicts:
	vendor/assets/leaflet/leaflet.hash.js
	vendor/assets/leaflet/leaflet.js
This commit is contained in:
John Firebaugh 2013-11-19 09:42:47 -08:00
commit 44629832dd
28 changed files with 940 additions and 717 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/views/export/embed.html.erb
View file

@ -4,9 +4,6 @@
<meta charset="utf-8">
<title>OpenStreetMap Embedded</title>
<%= stylesheet_link_tag "embed", :media=> "screen" %>
<!--[if IE]>
<%= stylesheet_link_tag "leaflet.ie", :media=> "screen" %>
<![endif]-->
<%= javascript_include_tag "embed" %>
</head>
<body>