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

Merge branch 'master' into openstreetbugs

Browse source 
Conflicts:
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
This commit is contained in:
Tom Hughes 2011-08-13 11:48:04 +01:00
commit 72e33046c8
134 changed files with 3722 additions and 1345 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/example.application.yml
View file

@ -59,6 +59,8 @@ standard_settings: &standard_settings
gpx_image_dir: "/home/osm/images"
# Location of data for file columns
#file_column_root: ""
# Log file to use
#log_path: ""
# List of memcache servers to use for caching
#memcache_servers: []
# Enable legacy OAuth 1.0 support