Merge branch 'release-2.5' (be1b7df6) · Commits · ubl / finc / vufind · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

vufind
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- 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.

ubl
finc
vufind
Commits
be1b7df6

Commit be1b7df6 authored 8 years ago by

Demian Katz

Downloads
- Plain Diff

Merge branch 'release-2.5'

# Conflicts:
#	build.xml
#	composer.json
#	config/vufind/config.ini
#	packages/DEBIAN/changelog
#	packages/DEBIAN/control

parents 3aeccdc0 82831304

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

module/VuFind/src/VuFind/Session/AbstractBase.php 6 additions, 4 deletions

module/VuFind/src/VuFind/Session/AbstractBase.php
module/VuFind/src/VuFind/Session/Database.php 5 additions, 2 deletions

module/VuFind/src/VuFind/Session/Database.php
module/VuFind/src/VuFind/Session/File.php 2 additions, 2 deletions

module/VuFind/src/VuFind/Session/File.php
module/VuFind/src/VuFind/Session/Memcache.php 1 addition, 1 deletion

module/VuFind/src/VuFind/Session/Memcache.php
packages/DEBIAN/changelog 6 additions, 0 deletions

packages/DEBIAN/changelog
packages/DEBIAN/control 14 additions, 1 deletion

packages/DEBIAN/control

with 34 additions and 10 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