Merge remote-tracking branch... (ca642209) · Commits · afi / opacce · GitLab

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 ca642209 authored 10 years ago by

Patrick Barroca

Merge remote-tracking branch...

Merge remote-tracking branch 'refs/remotes/afi/dev_#18866_typo_3_specific_event' into afi-dev_#18867_typo3_dossiers_documentaires

Conflicts:
	library/Class/Import/Typo3.php
	tests/library/Class/Import/Typo3Test.php

parents 1d1e2f49 c616c771

Branches

Tags

3 merge requests!715Master,!697Dev #18867 typo3 dossiers documentaires,!672Dev #18867 typo3 dossiers documentaires

Hide whitespace changes

Inline Side-by-side

Showing with 1 addition and 0 deletions

Please register or to comment