Merge remote-tracking branch 'refs/remotes/origin/master' into... (a9e64838) · 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 a9e64838 authored 9 years ago by

Patrick Barroca

Browse files

Merge remote-tracking branch 'refs/remotes/origin/master' into...

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#33379_redmine_create_and_edit_ticket

Conflicts:
	library/Class/Users.php

parents fe0301e5 0be7ff72

7 merge requests!1553Master,!1502Master,!1501Stable,!1472Stable,!1409Stable,!1403Dev#33379 redmine create and edit ticket,!1387Dev#33379 redmine create and edit ticket

Hide whitespace changes

Inline Side-by-side

Showing with 723 additions and 306 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'refs/remotes/origin/master' into...