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 5151c34a authored 9 years ago by

Liang Qi

Browse files

Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	examples/virtualkeyboard/basic/basic.pro
	src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf

Change-Id: I92b07ae67779bba37141408e28c6f67e1731383a

parents 9c401c08 feb7f323

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 27 additions and 18 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'origin/5.6' into 5.7