raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-12 03:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix_units

Browse Source 
Conflicts:
	app/assets/javascripts/admin/products/units_controller.js.coffee
This commit is contained in:
Rafael Schouten
2014-07-14 15:10:26 +01:00
parent ef1b72cec9 9f5f319edb
commit 58e6379e43
117 changed files with 1296 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/services/option_value_namer.js.coffee
View File

@@ -1,4 +1,4 @@
angular.module("ofn.admin").factory "optionValueNamer", ($resource) ->
angular.module("admin.products").factory "optionValueNamer", ->
class OptionValueNamer
constructor: (@variant) ->