Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Car Share
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

52775fa3

Commit 52775fa3 authored 2 years ago by CONTOUX Antoine

Downloads
- Plain Diff

Merge remote-tracking branch 'forge/main' into main

parents cd715962 3bfdfec8

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/frontend/src/components/cards/CardPopup.vue 7 additions, 0 deletions

src/frontend/src/components/cards/CardPopup.vue
src/frontend/src/components/cards/TripDetail.vue 1 addition, 1 deletion

src/frontend/src/components/cards/TripDetail.vue
src/frontend/src/components/profile/UserGroups.vue 1 addition, 1 deletion

src/frontend/src/components/profile/UserGroups.vue
src/frontend/src/langs/en.js 1 addition, 1 deletion

src/frontend/src/langs/en.js
src/frontend/src/scripts/Logs.js 3 additions, 3 deletions

src/frontend/src/scripts/Logs.js
src/frontend/src/views/Main.vue 11 additions, 9 deletions

src/frontend/src/views/Main.vue
src/frontend/src/views/Recovery.vue 1 addition, 1 deletion

src/frontend/src/views/Recovery.vue
src/frontend/src/views/TripsNew.vue 17 additions, 4 deletions

src/frontend/src/views/TripsNew.vue

with 42 additions and 20 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment