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

..

_footer.html.haml

changed about link in footer to point to specific wiki page

2013-08-20 14:36:32 +10:00

_header.html.haml

Merge branch 'dev' into places2

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

_meta.html.haml

Removed duplicate stylesheet_link_tag

2013-04-24 20:11:21 -04:00

application.html.haml

CSS tweaks and some tests

2013-08-07 13:21:27 +10:00