Merge branch 'master' into openstreetbugs

Browse source

Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml
	config/openlayers.cfg
	db/structure.sql
	vendor/assets/openlayers/OpenLayers.js

...

This commit is contained in:

Tom Hughes 2012-08-22 20:52:08 +01:00

parent fe16fec000 a9a5b6ef38

commit 0d3a9ed9cb

762 changed files with 18663 additions and 13000 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1410

vendor/assets/openlayers/OpenLayers.js vendored

View file

File diff suppressed because one or more lines are too long