Miles Gould c1870d46a2 Merge branch 'dev' into seed_properties ...

Conflicts:
	db/schema.rb

2015-02-02 17:45:49 +00:00

..

adding_seeds_spec.rb

Merge branch 'dev' into seed_properties

2015-02-02 17:45:49 +00:00

misc_seeds_spec.rb

Fix stupid call-nonexistent-method bug in tests.

2015-02-01 10:11:55 +00:00