Miles Gould 7857bfd0df Merge branch 'dev' into places2 ...

Fix up broken indentation on navbar.
Conflicts:
	app/views/layouts/_header.html.haml

2013-08-23 13:29:37 +01:00

..

assets

Moving development to top level directory

2012-08-23 10:41:00 -07:00

haml/filters

Tests for Haml::Filters::EscapedMarkdown.

2013-05-16 18:00:00 +01:00

tasks

populate scientific names creator field

2013-08-21 17:52:33 +10:00

nominatim.rb

Replace Geocoder lookups with direct calls to Nominatim.

2013-08-23 13:11:02 +01:00