From: Kai Krueger Date: Sat, 30 Apr 2011 02:52:59 +0000 (-0600) Subject: Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs2 X-Git-Tag: live~5125^2~183 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/43e12e7d02307ad92cc51ebd09f4e88a466168aa?hp=a6f45adede24e47b113dcf0f33e701478076f1b7 Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs2 --- diff --git a/config/example.application.yml b/config/example.application.yml index 13936cfa5..cf7565856 100644 --- a/config/example.application.yml +++ b/config/example.application.yml @@ -57,6 +57,8 @@ standard_settings: &standard_settings gpx_image_dir: "/home/osm/images" # Location of data for file columns #file_column_root: "" + # List of memcache servers to use for caching + #memcache_servers: [] # Enable legacy OAuth 1.0 support oauth_10_support: true # URL of Nominatim instance to use for geocoding @@ -73,7 +75,6 @@ development: production: <<: *standard_settings - require_terms_seen: false test: <<: *standard_settings diff --git a/public/favicon.ico b/public/favicon.ico index 0157ea008..4448dd6f6 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/images/osm_logo.png b/public/images/osm_logo.png index d2ddc6969..01762813b 100644 Binary files a/public/images/osm_logo.png and b/public/images/osm_logo.png differ diff --git a/public/images/osm_logo.svg b/public/images/osm_logo.svg new file mode 100644 index 000000000..f24d47abc --- /dev/null +++ b/public/images/osm_logo.svg @@ -0,0 +1,3349 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 010110010011010110010011 + 010110010011010110010011 + + + +