Merge remote-tracking branch 'refs/remotes/origin/master' into... (cd3cf243) · Commits · afi / opacce

There was a problem fetching the latest pipeline status.

Commit cd3cf243 authored 6 years ago by

Ghislain Loas

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

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#64573_amelioration_de_la_charte_modele

Conflicts:
	application/modules/opac/views/scripts/auth/ajax-login.phtml
	cosmogramme/sql/patch/patch_348.php
	tests/application/modules/AbstractControllerTestCase.php
	tests/application/modules/admin/controllers/WidgetControllerTest.php
	tests/db/UpgradeDBTest.php

parents 6cb9ea61 d69b99c2

Branches

Admin message

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