Merge branch 'master' into origin-hotline-12583 (cce14366) · 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
cce14366

Commit cce14366 authored 11 years ago by

llaffont

Downloads
- Plain Diff

Merge branch 'master' into origin-hotline-12583

parents 6f7e0d9b 73d934fe

Branches

Tags

2 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!10Hotline 12583

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

cosmogramme/php/_menu.php 0 additions, 1 deletion

cosmogramme/php/_menu.php
cosmogramme/php/classes/classe_abonne.php 15 additions, 4 deletions

cosmogramme/php/classes/classe_abonne.php
cosmogramme/php/classes/classe_sql.php 4 additions, 3 deletions

cosmogramme/php/classes/classe_sql.php
cosmogramme/php/integre_generation_pergame.php 11 additions, 9 deletions

cosmogramme/php/integre_generation_pergame.php
cosmogramme/tests/php/classes/AbonneIntegrationTest.php 35 additions, 21 deletions

cosmogramme/tests/php/classes/AbonneIntegrationTest.php
library/Class/IntMajAuto.php 27 additions, 0 deletions

library/Class/IntMajAuto.php

with 92 additions and 38 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