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.

An error occurred while loading the file. Please try again.

Merge branch 'master' into toplevelwindow · 57742ac7

Zeno Albisser authored 13 years ago

Conflicts:
	components/Menu.qml
	components/MenuItem.qml
	components/styleitem/qtmenu.cpp
	components/styleitem/qtmenuitem.cpp
	components/styleitem/qtmenuitem.h
	components/styleitem/styleitem.pro
	desktop.pro
	src/styleitem/qstyleitem.cpp
	src/styleitem/qstyleplugin.cpp
	src/styleitem/qtmenu.h

57742ac7

Admin message