Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

79efb6fa

Commit 79efb6fa authored 7 years ago by Raph El

Downloads
- Plain Diff

Merge branch 'terla' of https://github.com/pixelhumain/co2 into terla

parents bd43830d ca07bc23

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

assets/js/default/calendar.js 25 additions, 7 deletions

assets/js/default/calendar.js
assets/js/default/circuit.js 88 additions, 109 deletions

assets/js/default/circuit.js
assets/js/default/profilSocial.js 2 additions, 2 deletions

assets/js/default/profilSocial.js
components/CommunecterController.php 4 additions, 0 deletions

components/CommunecterController.php
controllers/CircuitController.php 35 additions, 0 deletions

controllers/CircuitController.php
views/admin/terla/circuits.php 64 additions, 3 deletions

views/admin/terla/circuits.php
views/pod/circuit.php 31 additions, 1 deletion

views/pod/circuit.php

with 249 additions and 122 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