Merge branch 'origin-hotline_6.43' (c06ba3cd) · 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
c06ba3cd

Commit c06ba3cd authored 10 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge branch 'origin-hotline_6.43'

Conflicts:
	VERSIONS
	library/startup.php

parents 0e044bc1 bf5fae69

3 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!180Master,!125Master

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS 9 additions, 1 deletion

VERSIONS
library/Class/WebService/SIGB/Koha/Service.php 5 additions, 4 deletions

library/Class/WebService/SIGB/Koha/Service.php
library/Class/WebService/SIGB/Opsys/Service.php 3 additions, 2 deletions

library/Class/WebService/SIGB/Opsys/Service.php
library/startup.php 1 addition, 1 deletion

library/startup.php
tests/library/Class/WebService/SIGB/KohaTest.php 44 additions, 1 deletion

tests/library/Class/WebService/SIGB/KohaTest.php
tests/library/Class/WebService/SIGB/OpsysServiceTest.php 46 additions, 7 deletions

tests/library/Class/WebService/SIGB/OpsysServiceTest.php

with 108 additions and 16 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