Merge remote-tracking branch 'refs/remotes/origin/master' into... (f3479d30) · 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 f3479d30 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#23223_sito_widget_pagination

Conflicts:
	cosmogramme/sql/patch/patch_279.php
	tests/db/UpgradeDBTest.php

parents 3f5b099e db7ed9cb

Hide whitespace changes

Inline Side-by-side

Showing with 148 additions and 43 deletions

Please register or to comment

Admin message

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