Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs2

Browse source

...

This commit is contained in:

Kai Krueger 2011-04-29 20:52:59 -06:00

parent a6f45adede c738c964aa

commit 43e12e7d02

4 changed files with 3351 additions and 1 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

BIN

public/images/osm_logo.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 24 KiB After Width:  |  Height:  |  Size: 24 KiB

3349

public/images/osm_logo.svg Normal file

View file

File diff suppressed because one or more lines are too long

Side by side After Width:  |  Height:  |  Size: 160 KiB