vabene1111 12a1f261db Merge branch 'develop' of http://translate.tandoor.dev/git/tandoor/recipes-backend into develop ... # Conflicts: # vue/src/locales/ru.json		2022-12-31 13:36:34 +01:00
..
.openapi-generator	Fix after rebase	2021-12-28 12:03:31 -06:00
src	Merge branch 'develop' of http://translate.tandoor.dev/git/tandoor/recipes-backend into develop	2022-12-31 13:36:34 +01:00
babel.config.js
babel.config.js.c	made and compiled messages	2021-04-11 15:09:54 +02:00
package.json	Merge pull request #2195 from TandoorRecipes/dependabot/npm_and_yarn/vue/typescript-4.9.3	2022-12-19 16:07:47 +01:00
tsconfig.json	Squashed commit of the following:	2021-07-29 16:38:26 -05:00
vue.config.js	basics of new settings page working	2022-07-14 17:50:20 +02:00
yarn.lock	Merge pull request #2195 from TandoorRecipes/dependabot/npm_and_yarn/vue/typescript-4.9.3	2022-12-19 16:07:47 +01:00