raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
29235cd2cb415a3936ac4f930eabd8dbcdcaa251
openfoodnetwork/app
History
Rohan Mitchell 29235cd2cb Merge branch 'master' into product-amount-units 
Conflicts:
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	spec/spec_helper.rb
2014-01-14 15:34:05 +11:00
..
assets
Merge branch 'master' into product-amount-units
2014-01-14 15:34:05 +11:00
controllers
Merge branch 'bpe_paginate'
2014-01-09 12:07:42 +11:00
helpers
Merging from master
2013-12-17 14:18:21 +11:00
mailers
Fixing some breaking bugs in the refactored mailer
2013-12-13 15:40:23 +11:00
models
Merge branch 'master' into product-amount-units
2014-01-14 15:34:05 +11:00
overrides
Remove reference to deleted stylesheet
2013-12-17 12:48:44 +11:00
presenters
Simplify exchange products/variants JSON output format, bind angular to this
2013-01-10 10:59:53 +11:00
views
Toggle new view controls on BPE
2014-01-10 00:26:54 +08:00