Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

c55cb970

Commit c55cb970 authored 2 years ago by Thomas Dulac

Downloads
- Plain Diff

Merge branch 'dev' into 'main'

Release 1.0.1

See merge request !21

parents 362b6086 fb9b1cb9

No related branches found

Tags 1.0.1

1 merge request!21Release 1.0.1

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 110 additions, 0 deletions

.gitlab-ci.yml
front/public/config.js 1 addition, 0 deletions

front/public/config.js
front/public/index.html 3 additions, 3 deletions

front/public/index.html
front/public/logo192.png 0 additions, 0 deletions

front/public/logo192.png
front/public/logo512.png 0 additions, 0 deletions

front/public/logo512.png
front/src/DevicesAvailable.tsx 1 addition, 1 deletion

front/src/DevicesAvailable.tsx
front/src/DevicesBorrowed.tsx 1 addition, 1 deletion

front/src/DevicesBorrowed.tsx
front/src/PopupBorrow.tsx 1 addition, 1 deletion

front/src/PopupBorrow.tsx
front/src/PopupPending.tsx 1 addition, 1 deletion

front/src/PopupPending.tsx
front/src/api.ts 2 additions, 1 deletion

front/src/api.ts

with 120 additions and 8 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