Merge branch 'master' into 'master' (77fbe830) · Commits · HAEFFLINGER AYMERIC / ArTi4 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ArTi4
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Container Registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

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.

HAEFFLINGER AYMERIC
ArTi4
Commits
77fbe830

Commit 77fbe830 authored 5 years ago by

INCERTI-JEANMOUGIN MATHILDE

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Update vue et ajout Lexique

See merge request t4-the-origin/arti4!20

parents 27ae4a82 ed7590d5

Branches

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

Arti4/Arti4/Formulaires/FORM_politique.Designer.cs 1 addition, 0 deletions

Arti4/Arti4/Formulaires/FORM_politique.Designer.cs
Arti4/Arti4/UserControls/UC_Jeu.Designer.cs 4 additions, 42 deletions

Arti4/Arti4/UserControls/UC_Jeu.Designer.cs
Arti4/Arti4/UserControls/UC_Menu.Designer.cs 3 additions, 3 deletions

Arti4/Arti4/UserControls/UC_Menu.Designer.cs
Arti4/Arti4/UserControls/UC_Scenario.Designer.cs 3 additions, 3 deletions

Arti4/Arti4/UserControls/UC_Scenario.Designer.cs
Lexique.md 85 additions, 0 deletions

Lexique.md

with 96 additions and 48 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment