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

Merge branch 'master' into 2-0-stable-oct

Browse Source
This commit is contained in:
luisramos0
2018-10-15 17:09:26 +01:00
parent a5a2cb8ea7 f8bccda6ab
commit 87cd73ddba
275 changed files with 7891 additions and 2490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,7 @@
//= require moment/nb.js
//= require moment/pt-br.js
//= require moment/sv.js
//= require ../shared/mm-foundation-tpls-0.8.0.min.js
//= require ../shared/mm-foundation-tpls-0.9.0-20180826174721.min.js
//= require angularjs-file-upload
//= require_tree .