Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

95329db4

Commit 95329db4 authored 7 years ago by Clément Damiens

Downloads
- Plain Diff

Merged branch terla into terla

parents 07847467 eef99596

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

assets/js/default/directory.js 1 addition, 1 deletion

assets/js/default/directory.js
assets/js/default/editInPlace.js 1 addition, 1 deletion

assets/js/default/editInPlace.js
controllers/AppController.php 3 additions, 3 deletions

controllers/AppController.php
views/default/panels/filterMenu.php 8 additions, 8 deletions

views/default/panels/filterMenu.php
views/element/terla/about.php 88 additions, 113 deletions

views/element/terla/about.php
views/element/terla/invoice.php 135 additions, 17 deletions

views/element/terla/invoice.php
views/search/searchTerla.php 2 additions, 2 deletions

views/search/searchTerla.php
views/translation/trad.php 1 addition, 0 deletions

views/translation/trad.php

with 239 additions and 145 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