Ulf Gebhardt e5f98f2cee

Merge branch 'master' into 2019/kw15/User_can_change_its_username_to_emptystring ...

# Conflicts:
#	webapp/locales/de.json
#	webapp/locales/en.json
#	webapp/pages/profile/_id/_slug.vue

2019-04-17 13:59:30 +02:00

..

de.json

Merge branch 'master' into 2019/kw15/User_can_change_its_username_to_emptystring

2019-04-17 13:59:30 +02:00

en.json

Merge branch 'master' into 2019/kw15/User_can_change_its_username_to_emptystring

2019-04-17 13:59:30 +02:00

es.json

Merging webapp to master

2019-03-20 21:06:17 +01:00

fr.json

Merging webapp to master

2019-03-20 21:06:17 +01:00

index.js

Merging webapp to master

2019-03-20 21:06:17 +01:00

it.json

first implementation - unclear if specifications are correct

2019-04-10 13:35:24 +02:00

nl.json

Merging webapp to master

2019-03-20 21:06:17 +01:00

pl.json

first implementation - unclear if specifications are correct

2019-04-10 13:35:24 +02:00

pt.json

first implementation - unclear if specifications are correct

2019-04-10 13:35:24 +02:00