mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-01-24 20:36:49 +00:00
Merge branch 'master' into product-amount-units
Conflicts: config/ng-test.conf.js
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
= render "layouts/bugherd_script"
|
||||
|
||||
= csrf_meta_tags
|
||||
%body.off-canvas
|
||||
%body
|
||||
%nav.top-bar
|
||||
%section.top-bar-section
|
||||
%ul.left
|
||||
|
||||
Reference in New Issue
Block a user