openfoodnetwork

mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00

Files

Will Marshall 20d7484134 Merge branch 'master' into laura_and_will

Conflicts:
	app/assets/javascripts/darkswarm/services/order.js.coffee

2014-07-28 13:43:31 +10:00

2014-07-24 10:16:55 +10:00

address_serializer.rb

2014-07-17 14:19:39 +10:00

current_order_serializer.rb

2014-07-17 14:23:09 +10:00

enterprise_serializer.rb

2014-07-04 14:39:26 +10:00

id_serializer.rb

2014-07-24 10:16:54 +10:00

image_serializer.rb

2014-07-18 11:21:51 +10:00

line_item_serializer.rb

2014-07-18 11:21:51 +10:00

payment_method_serializer.rb

2014-07-17 14:23:09 +10:00

product_serializer.rb

2014-07-28 11:30:35 +10:00

property_serializer.rb

2014-07-10 12:46:25 +10:00

shipping_method_serializer.rb

2014-07-17 14:23:09 +10:00

taxon_image_serializer.rb

2014-07-10 12:46:25 +10:00

taxon_serializer.rb

2014-07-04 14:38:27 +10:00

variant_serializer.rb

2014-07-28 11:30:35 +10:00