Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchParapheur
- Activity
- Members
- Redmine
- Releases
- Model registry

Snippets Groups Projects

ed95f176

Commit ed95f176 authored 2 years ago by Jean-Laurent DUZANT

Downloads
- Plain Diff

Merge branch 'develop' into 'fix/23980/develop'

# Fix conflicts:
#   src/frontend/app/app.component.ts

parents 76359765 420f1f52

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/frontend/app/pad/pad.component.html 1 addition, 1 deletion

src/frontend/app/pad/pad.component.html
src/frontend/app/pad/pad.component.ts 21 additions, 14 deletions

src/frontend/app/pad/pad.component.ts
src/frontend/app/sidebar/sidebar.component.ts 2 additions, 1 deletion

src/frontend/app/sidebar/sidebar.component.ts
src/frontend/core/global.scss 8 additions, 2 deletions

src/frontend/core/global.scss

with 32 additions and 18 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