Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

OSE
- Activity
- Members
- Labels
- Wiki
- Redmine
- Environments

Snippets Groups Projects

4388c2f4

You need to sign in or sign up before continuing.

Commit 4388c2f4 authored Mar 13, 2019 by Alexandre Zvenigorosky

Downloads
- Patches
- Plain Diff

Merge branch 'b8.1' of https://git.unicaen.fr/open-source/OSE into types-diplome

# Conflicts:
#	module/Application/config/administration.config.php

parent 76528e12

No related branches found

No related tags found

Loading

Changes 3

Show whitespace changes

Inline Side-by-side

Showing

module/Application/config/administration.config.php 1 addition, 1 deletion

module/Application/config/administration.config.php
module/Application/config/groupe-type-formation.config.php 2 additions, 2 deletions

module/Application/config/groupe-type-formation.config.php
module/Application/view/application/groupe-type-formation/index.phtml 1 addition, 1 deletion

...cation/view/application/groupe-type-formation/index.phtml

with 4 additions and 4 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