Merge branch 'main' into 'main' (3dffbfcd) · Commits · LE groupe / PEC22-T3-A · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

PEC22-T3-A
- Activity
- Members
- Labels
- Issues
  2
- Issue boards
- Milestones
- Wiki
- Releases
- Package Registry
- Environments
- Terraform modules
- 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.

LE groupe
PEC22-T3-A
Commits
3dffbfcd

There was an error fetching the commit references. Please try again later.

Commit 3dffbfcd authored 2 years ago by

MARQUE ELISE

Downloads
- Plain Diff

Merge branch 'main' into 'main'

Main

See merge request !77

parents 11d97988 b19d8f16

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.idea/workspace.xml 59 additions, 0 deletions

.idea/workspace.xml
README.md 2 additions, 5 deletions

README.md
unity_project/Marsgriculteur/Assets/Scenes/Map.unity 806 additions, 8 deletions

unity_project/Marsgriculteur/Assets/Scenes/Map.unity
unity_project/Marsgriculteur/Assets/Script/Map/OpenShop.cs 20 additions, 0 deletions

unity_project/Marsgriculteur/Assets/Script/Map/OpenShop.cs
unity_project/Marsgriculteur/Assets/Script/Map/OpenShop.cs.meta 1 addition, 1 deletion

...project/Marsgriculteur/Assets/Script/Map/OpenShop.cs.meta
unity_project/Marsgriculteur/Assets/Script/Map/ShopEvents.cs 0 additions, 17 deletions

unity_project/Marsgriculteur/Assets/Script/Map/ShopEvents.cs

with 888 additions and 31 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