Merge branch 'hotline-master' (a1add632) · Commits · afi / opacce

Snippets Groups Projects

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.

Commit a1add632 authored 9 years ago by

Ghislain Loas

Browse files

Merge branch 'hotline-master'

Conflicts:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_248.php

* tests/library/Class/AlbumAuthorTest.php:

parents 67ec2566 918d1308

2 merge requests!896Master,!869Master

Hide whitespace changes

Inline Side-by-side

Showing with 160 additions and 35 deletions

Please register or to comment

Admin message

Merge branch 'hotline-master'