Merge branch 'origin-stable' into origin-hotline-master (1d25de26) · Commits · afi / opacce · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

opacce
- Activity
- Members
- Labels
- Issues
  2
- Issue boards
- Milestones
- Wiki
- Releases
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

afi
opacce
Commits
1d25de26

Commit 1d25de26 authored 8 years ago by

Ghislain Loas

Downloads
- Plain Diff

Merge branch 'origin-stable' into origin-hotline-master

Conflicts:
	library/Class/PremierChapitre.php
	tests/library/Class/PremierChapitre/PremierChapitreTest.php

parents eb8c9827 e718d7ea

Branches

Tags

3 merge requests!1797Master,!1778Master,!1777Hotline master

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/41580 1 addition, 0 deletions

VERSIONS_HOTLINE/41580
VERSIONS_HOTLINE/46763 1 addition, 0 deletions

VERSIONS_HOTLINE/46763
application/modules/admin/controllers/SystemeController.php 18 additions, 21 deletions

application/modules/admin/controllers/SystemeController.php
library/Class/PremierChapitre.php 6 additions, 9 deletions

library/Class/PremierChapitre.php
tests/application/modules/admin/controllers/SystemeControllerTest.php 65 additions, 1 deletion

...ation/modules/admin/controllers/SystemeControllerTest.php
tests/library/Class/PremierChapitre/PremierChapitreTest.php 23 additions, 2 deletions

tests/library/Class/PremierChapitre/PremierChapitreTest.php
tests/library/ZendAfi/View/Helper/Accueil/PremierChapitreTest.php 0 additions, 69 deletions

...brary/ZendAfi/View/Helper/Accueil/PremierChapitreTest.php

with 114 additions and 102 deletions

0% 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