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 767effaf authored 12 years ago by

Frederik Gladhorn

Browse files

Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/xmlpatterns/api/qcoloroutput_p.h
	src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h
	sync.profile

Change-Id: Ibf1d2ab42c4316d9fada397b1f1c0f37e65662dd

parents f81f71ea 9a30672d

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 61 additions and 1257 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'origin/stable' into dev