Miles Gould 2c6e2ee2d7 Merge branch 'dev' into places2 ...

Conflicts:
	app/views/members/_popover.html.haml

2013-08-28 13:02:25 +01:00

..

_avatar.html.haml

Tweaked member avatars

2013-03-11 14:32:34 +11:00

_image_with_popover.html.haml

Added seeds and people to homepage

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

_popover.html.haml

Merge branch 'dev' into places2

2013-08-28 13:02:25 +01:00

_thumbnail.html.haml

think we've FINALLY really fixed the member layout

2013-08-22 00:30:02 +10:00

index.html.haml

Merge branch 'dev' of https://github.com/Growstuff/growstuff into places2

2013-08-21 17:35:31 +10:00

nearby.html.haml

fixed member thumbnails on homepage and changed member index to match

2013-08-09 14:58:36 +10:00

show.html.haml

Merge branch 'dev' into places2

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

show.rss.haml

removed author fields from RSS

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