Skip to content
Snippets Groups Projects
Commit 0139e5f9 authored by benxidosz's avatar benxidosz
Browse files

Merge branch 'master' into Moving_bg

# Conflicts:
#	Assets/Materials/background images.meta
#	Assets/Scripts/GameManager.cs
parents ab9a6fa3 46b2403c
No related branches found
No related tags found
1 merge request!21Moving background added
Showing
with 574 additions and 189 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment