Brenda Wallace 14551b6ec8 Merge remote-tracking branch 'upstream/dev' into feature/photos-1457 ...

Conflicts:
	spec/models/crop_spec.rb

2017-12-09 20:59:20 +13:00

..

migrate

Merge remote-tracking branch 'upstream/dev' into feature/photos-1457

2017-12-09 20:59:20 +13:00

seeds

Removed all trailing white space

2016-11-14 15:05:32 +13:00

schema.rb

Adding a unique index on the items <--> photos table

2017-11-30 09:56:47 +13:00

seeds.rb

rubocop fox for numeric literals

2017-03-01 17:46:12 +13:00