Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

4078b3d6

Commit 4078b3d6 authored 5 years ago by Raph El

Downloads
- Plain Diff

Merge branch 'master' into qa

parents 8ad95f06 0bdffa26

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

assets/js/default/loginRegister.js 6 additions, 6 deletions

assets/js/default/loginRegister.js
controllers/DatamigrationController.php 35 additions, 1 deletion

controllers/DatamigrationController.php
docs/new_dev_doc.org 3 additions, 1 deletion

docs/new_dev_doc.org
docs/process/cms.org 7 additions, 0 deletions

docs/process/cms.org
docs/process/documentation.org 33 additions, 0 deletions

docs/process/documentation.org
docs/process/settings.org 5 additions, 0 deletions

docs/process/settings.org
views/element/banner.php 16 additions, 8 deletions

views/element/banner.php

with 105 additions and 16 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