Maikel Linke 903bd21577 Merge remote-tracking branch 'origin/master' into group-pages-merge ...

Conflicts:
	README.markdown
	db/schema.rb

2015-02-13 15:42:36 +11:00

..

assets

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

open_food_network

Find all producers for which we can create variant overrides

2015-02-04 10:13:35 +11:00

seed_data

New landing page - initial layout and functionality

2013-08-05 17:04:56 +10:00

spree

Merge remote-tracking branch 'origin/master' into group-pages-merge

2015-02-13 15:42:36 +11:00

tasks

Fix #242 - foreign key constraint error on load_sample_data

2014-09-05 15:10:14 +10:00

templates/erb/scaffold

Add default simple_form configuration, locales, scaffold

2012-06-19 10:29:26 +10:00