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

..

index.html.haml_spec.rb

Put locations in geolocated_member factory names.

2013-04-25 23:27:52 +01:00

show.html.haml_spec.rb

Merge branch 'dev' into places2

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

show.rss.haml_spec.rb

removed author fields from RSS

2013-08-05 12:23:36 +10:00