WIP: develop to foodsoft master diff #39

Draft

philipp wants to merge 12 commits from develop into master

pull from: develop

merge into: Foodsoft:master

Foodsoft:demo

Foodsoft:automatic_group_order_invoice

Foodsoft:automatic_group_order_invoice_plugin

Foodsoft:master

Foodsoft:1008-ideal-integration-online-payment-provider

Foodsoft:online-payment-mollie

Foodsoft:56_add_update_of_article_category_to_file_import

Foodsoft:x_11_file_import_via_plugin

Foodsoft:12_generate_custom_csv_file

Foodsoft:automatic_group_order_invoice_generation_merge

Foodsoft:8_increase_test_coverage_controllers_home

Foodsoft:8_increase_test_coverage_controllers

Foodsoft:37_display_kilo_price

Foodsoft:demo-merge-article-category

Foodsoft:11_include_kilo_litre_price

Foodsoft:uxui_group_order

Foodsoft:20_favourites

Foodsoft:12_nkn_file_plugin

Foodsoft:11_bnn_import_article_update

Foodsoft:52_messages_tests

Foodsoft:tantewandel

Conversation 0 Commits 12 Files changed 103 +1 -1

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files Hide outdated comments

Showing only changes of commit a7747c9e84 - Show all commits