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

lbrun

Browse files

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

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#34246_charte_graphique_backoffice

Conflicts:
	library/Class/Users.php
	tests/application/modules/admin/controllers/UsersControllerTest.php

parents 62dab7f3 f362221a

6 merge requests!1553Master,!1519Master,!1506Master,!1502Master,!1452Dev#34246 charte graphique backoffice,!1404Dev#34246 charte graphique backoffice

Hide whitespace changes

Inline Side-by-side

Showing with 255 additions and 107 deletions

Please register or to comment

Admin message

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