mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-02-01 21:47:16 +00:00
Conflicts: Gemfile Gemfile.lock app/controllers/spree/orders_controller_decorator.rb app/models/enterprise.rb app/models/spree/order_decorator.rb app/views/spree/checkout/_other_available_distributors.html.erb app/views/spree/products/_add_to_cart.html.haml lib/open_food_web/distributor_change_validator.rb spec/spec_helper.rb
38 lines
514 B
Plaintext
38 lines
514 B
Plaintext
.bundle
|
|
.rbenv-version
|
|
.ruby-version
|
|
.ruby-gemset
|
|
.swp
|
|
*.swo
|
|
*.swp
|
|
.sass-cache
|
|
db/*.sqlite3
|
|
log/*.log
|
|
log/*.log.lck
|
|
log/*.log.*
|
|
tmp/
|
|
.idea/*
|
|
\#*
|
|
.#*
|
|
*~
|
|
*.~lock.*
|
|
.emacs.desktop
|
|
.DS_Store
|
|
*.sublime-project*
|
|
spec/javascripts/generated/*
|
|
db/development_structure.sql
|
|
db/test_structure.sql
|
|
db/staging_structure.sql
|
|
db/production_structure.sql
|
|
db/backup
|
|
app/public
|
|
public/system
|
|
public/stylesheets
|
|
public/images
|
|
public/spree
|
|
config/abr.yml
|
|
config/heroku_env.rb
|
|
config/initializers/feature_toggle.rb
|
|
NERD_tree*
|
|
coverage
|