Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

co2
- Activity
- Members
- Labels
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

8765fe83

Commit 8765fe83 authored 6 years ago by Clément Damiens

Downloads
- Patches
- Plain Diff

conflict merge

parent c406dedd

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

README.md 28 additions, 21 deletions

README.md
assets/js/cooperation/uiCoop.js 1 addition, 0 deletions

assets/js/cooperation/uiCoop.js
assets/js/gallery/index.js 1 addition, 1 deletion

assets/js/gallery/index.js
controllers/DatamigrationController.php 53 additions, 0 deletions

controllers/DatamigrationController.php
views/cooperation/action.php 66 additions, 10 deletions

views/cooperation/action.php
views/cooperation/pod/modalCommon.php 212 additions, 0 deletions

views/cooperation/pod/modalCommon.php
views/element/invite.php 95 additions, 78 deletions

views/element/invite.php
views/pod/confidentiality.php 19 additions, 7 deletions

views/pod/confidentiality.php

with 475 additions and 117 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