Merge branch 'master' into 20-integration-menudepenses (26ba3e01) · Commits · Verin Antoine / Mango

This is an archived project. Repository and other project resources are read-only.

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 26ba3e01 authored 3 years ago by

Verin Antoine

Browse files

Merge branch 'master' into 20-integration-menudepenses

# Conflicts:
#	Controls/Menu/MenuDepenses.Designer.cs
#	bdEvents.mdb

parents 3e901951 8b666ec0

Branches

1 merge request!38Resolve "Intégration MenuDepenses"

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 1317 additions and 272 deletions

Please register or to comment

Admin message

Merge branch 'master' into 20-integration-menudepenses