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

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

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

..

assets

Fixed CSS problem with popup tip

2013-08-26 11:06:21 +10:00

controllers

Merge branch 'dev' into places2

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

helpers

rails g scaffold seed...

2013-07-15 22:53:29 +10:00

mailers

Move reply_link into a helper.

2013-05-01 23:45:07 +01:00

models

Merge branch 'dev' into places2

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

views

Merge branch 'dev' into places2

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