Merge branch 'master' into 'master' (8f3830ec) · Commits · Chirz / CityEscape

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 8f3830ec authored 3 years ago by

FISCHER MELVYN

Browse files

Merge branch 'master' into 'master'

# Conflicts:
#   Assets/Scenes/Menu.unity

parents c0a8df9e 00a3470c

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 602 additions and 11 deletions

Please register or to comment

Admin message

Merge branch 'master' into 'master'