Theresa Gresch f063b0ba1b Merge branch 'develop' ... # Conflicts: # frontend/src/dialog/p-upload-dialog.vue # frontend/src/dialog/photo/edit.vue # frontend/src/dialog/photo/info.vue # frontend/src/resources/de.mo # frontend/src/resources/de.po # frontend/src/resources/translations.json # frontend/src/resources/translations.pot		2020-06-16 10:51:31 +02:00
..
src	Merge branch 'develop'	2020-06-16 10:51:31 +02:00
tests
.babelrc
.eslintrc.js
karma.conf.js
package-lock.json	Frontend: Fix and update translation	2020-06-16 10:39:00 +02:00
package.json
postcss.config.js
webpack.config.js