cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
openstreetmap-website/vendor/assets/openlayers
History
Tom Hughes 52e5fa6ad7 Merge branch 'master' into openstreetbugs 
Conflicts:
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
	config/initializers/mime_types.rb
	config/routes.rb
	lib/map_boundary.rb
	lib/migrate.rb
	lib/osm.rb
	vendor/assets/openlayers/OpenLayers.js
2012-01-05 20:15:53 +00:00
..
img Serve OpenLayers through the asset pipeline 2011-11-25 20:07:50 +00:00
theme/default Serve OpenLayers through the asset pipeline 2011-11-25 20:07:50 +00:00
OpenLayers.js Merge branch 'master' into openstreetbugs 2012-01-05 20:15:53 +00:00
OpenStreetMap.js Allow OpenStreetMap.js to work with an unpatched OpenLayers 2011-12-31 00:25:04 +00:00