Merge branch 'stable' into hotline-master (d1602798) · 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
d1602798

Commit d1602798 authored 9 years ago by

Ghislain Loas

Downloads
- Plain Diff

Merge branch 'stable' into hotline-master

Conflicts:
	cosmogramme/sql/patch/patch_288.php
	tests/db/UpgradeDBTest.php

parents f95160aa f5e22357

Branches

Tags

5 merge requests!1587Master,!1553Master,!1539Master,!1537Master,!1536Hotline master

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/38194 1 addition, 0 deletions

VERSIONS_HOTLINE/38194
cosmogramme/php/classes/classe_notice_integration.php 8 additions, 14 deletions

cosmogramme/php/classes/classe_notice_integration.php
cosmogramme/sql/patch/patch_289.php 7 additions, 0 deletions

cosmogramme/sql/patch/patch_289.php
cosmogramme/tests/php/classes/NoticeIntegrationDedupTest.php 52 additions, 0 deletions

cosmogramme/tests/php/classes/NoticeIntegrationDedupTest.php
library/Class/CodifTags.php 16 additions, 4 deletions

library/Class/CodifTags.php
tests/db/UpgradeDBTest.php 33 additions, 0 deletions

tests/db/UpgradeDBTest.php

with 117 additions and 18 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