Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master (c432c371) · 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
c432c371

There was a problem fetching the pipeline stages.

Commit c432c371 authored 7 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	cosmogramme/php/classes/classe_log.php

parents a509fae8 ba4fe049

Branches

Tags

4 merge requests!2334Master,!2157Dev#40650 contractuel 5255 dole preinscription en ligne bressuire concarneau ccvh,!2156Master,!2155Hotline master

Pipeline #1490 passed with stage

in 10 minutes and 54 seconds

Changes 8
Pipelines 1

Expand all Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/60547 1 addition, 0 deletions

VERSIONS_HOTLINE/60547
cosmogramme/php/classes/classe_dewey.php 116 additions, 125 deletions

cosmogramme/php/classes/classe_dewey.php
cosmogramme/php/classes/classe_log.php 64 additions, 59 deletions

cosmogramme/php/classes/classe_log.php
cosmogramme/php/classes/classe_pcdm4.php 111 additions, 115 deletions

cosmogramme/php/classes/classe_pcdm4.php
cosmogramme/php/codif_dewey.php 19 additions, 20 deletions

cosmogramme/php/codif_dewey.php
cosmogramme/php/codif_pcdm4.php 21 additions, 22 deletions

cosmogramme/php/codif_pcdm4.php
cosmogramme/php/config_integrations.php 2 additions, 2 deletions

cosmogramme/php/config_integrations.php
cosmogramme/php/integre_analyse_fichier_unimarc.php 243 additions, 247 deletions

cosmogramme/php/integre_analyse_fichier_unimarc.php

with 577 additions and 590 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