Merge branch 'master' into 'GREG-72-nicer-footer-and-header'
# Conflicts: # frontend/src/routes/register/index.tsx
Showing
- frontend/public/locales/en/common.json 12 additions, 3 deletionsfrontend/public/locales/en/common.json
- frontend/public/locales/nb/common.json 16 additions, 7 deletionsfrontend/public/locales/nb/common.json
- frontend/public/locales/nn/common.json 17 additions, 8 deletionsfrontend/public/locales/nn/common.json
- frontend/src/routes/register/formData.ts 1 addition, 1 deletionfrontend/src/routes/register/formData.ts
- frontend/src/routes/register/index.tsx 7 additions, 11 deletionsfrontend/src/routes/register/index.tsx
- frontend/src/routes/register/personFormMethods.ts 1 addition, 1 deletionfrontend/src/routes/register/personFormMethods.ts
- frontend/src/routes/register/stepPersonForm.tsx 26 additions, 7 deletionsfrontend/src/routes/register/stepPersonForm.tsx
- frontend/src/routes/register/stepSummary.tsx 78 additions, 138 deletionsfrontend/src/routes/register/stepSummary.tsx
- frontend/src/themes/main.ts 1 addition, 0 deletionsfrontend/src/themes/main.ts
- frontend/src/themes/uib.ts 1 addition, 0 deletionsfrontend/src/themes/uib.ts
- frontend/src/themes/uio.ts 2 additions, 1 deletionfrontend/src/themes/uio.ts
Loading
Please register or sign in to comment