Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

madis
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

fad11f44

Commit fad11f44 authored 2 years ago by Jonathan Foucher

Downloads
- Plain Diff

Merge branch 'dev-datakode' into develop

# Conflicts:
#	src/Infrastructure/ORM/Registry/Repository/Mesurement.php

parents fdb0a6d8 f7ee72f0

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/Domain/AIPD/Controller/AnalyseImpactController.php 0 additions, 3 deletions

src/Domain/AIPD/Controller/AnalyseImpactController.php
src/Infrastructure/ORM/Registry/Repository/Mesurement.php 9 additions, 13 deletions

src/Infrastructure/ORM/Registry/Repository/Mesurement.php
templates/Aipd/Analyse_impact/pdf.html.twig 1 addition, 1 deletion

templates/Aipd/Analyse_impact/pdf.html.twig

with 10 additions and 17 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