Miles Gould 0f22fbf4aa Merge branch 'dev' into members_nearby ...

Conflicts:
	spec/factories/member.rb

2013-04-02 13:10:38 +01:00

..

migrate

added sunniness field to plantings

2013-03-29 16:33:37 +11:00

seeds

Fixed tests by getting rid of valid_session

2012-11-26 19:04:43 +11:00

schema.rb

Merge branch 'dev' into members_nearby

2013-04-02 13:10:38 +01:00

seeds.rb

Fixed reference to User in db/seeds.rb

2013-01-13 11:33:16 +00:00