Miles Gould a5d14321b5 Merge branch 'dev' into delete_photos ...

Conflicts:
	spec/models/planting_spec.rb

2013-06-04 11:45:44 +01:00

..

assets

added crop photos and a new placeholder image

2013-06-04 12:22:31 +10:00

controllers

Avoid duplicate photos on plantings (or vice versa)

2013-06-01 12:07:17 +10:00

helpers

Delete unused photos_helper.

2013-05-31 11:28:59 +01:00

mailers

Move reply_link into a helper.

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

models

Merge branch 'dev' into delete_photos

2013-06-04 11:45:44 +01:00

views

Merge branch 'dev' into delete_photos

2013-06-04 11:45:44 +01:00