Rohan Mitchell 7486daa2a3 Merge branch 'master' into require_standard_variant ...

Conflicts:
	spec/controllers/spree/admin/variants_controller_spec.rb
	spec/lib/open_food_network/permissions_spec.rb
	spec/lib/open_food_network/products_and_inventory_report_spec.rb
	spec/models/enterprise_spec.rb

2015-05-28 15:08:13 +10:00

..

admin

Merge branch 'master' into require_standard_variant

2015-05-22 12:22:54 +10:00

darkswarm

#541 add "show more" link to producers lists in hub on home page

2015-05-11 20:31:24 +10:00

shared

Revert "Update bindonce"

2015-01-25 14:08:29 +11:00

store

return basic css and js for oldskool login that somehow still exists

2014-10-02 13:24:59 +10:00

templates

Changed selectors' ng-repeat. Using existing variable instead of method call

2015-05-03 15:24:16 +10:00

application.js

new rails 3.1.4 app

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

distributors.js.coffee

Adding the distributors controller

2013-12-04 15:58:25 +11:00

iehack.js

Patching up IE warning

2014-06-19 15:18:14 +10:00

jquery-migrate-1.0.0.js

Removing JMigrate warnings

2014-02-27 16:15:06 +11:00