raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'new-product-form'

Browse Source 
Conflicts:
	app/assets/javascripts/admin/admin.js.coffee
This commit is contained in:
Rohan Mitchell
2014-05-24 17:14:32 +10:00
parent 9c1528607a 4a9a1029a1
commit e951f80070
40 changed files with 341 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/admin/all.js
View File

@@ -16,5 +16,6 @@
//= require admin/spree_auth
//= require admin/spree_promo
//= require ./admin
//= require ./products/products
//= require_tree .