vabene1111 a5135de50b Merge branch 'develop' into feature/shopping-ui ... # Conflicts: # cookbook/models.py # vue/src/locales/en.json		2024-01-08 06:45:56 +08:00
..
.openapi-generator	Fix after rebase	2021-12-28 12:03:31 -06:00
src	Merge branch 'develop' into feature/shopping-ui	2024-01-08 06:45:56 +08:00
.yarnrc.yml	added ingredient auto sort feature	2022-12-31 16:19:13 +01:00
babel.config.js
babel.config.js.c	made and compiled messages	2021-04-11 15:09:54 +02:00
package.json	playing around with codemirror	2023-12-10 16:03:14 +01:00
tsconfig.json	remove unused imports, variables and commented code in helpers	2023-09-13 09:29:48 -05:00
vue.config.js	fully integrated property editor	2023-12-02 18:02:22 +01:00
yarn.lock	improved mobile shopping entry adding layout	2023-12-22 09:25:30 +01:00