Skip to content

Commit

Permalink
Merge con master
Browse files Browse the repository at this point in the history
  • Loading branch information
0xAdriaTorralba committed Dec 13, 2017
1 parent 03c8db7 commit d5559ca
Show file tree
Hide file tree
Showing 1,954 changed files with 623,000 additions and 434,885 deletions.
2 changes: 1 addition & 1 deletion SlothWars/Assets/3D Models.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions SlothWars/Assets/3D Models/Animations.meta

This file was deleted.

9 changes: 0 additions & 9 deletions SlothWars/Assets/3D Models/Animations/Animations.meta

This file was deleted.

Binary file not shown.
Loading

0 comments on commit d5559ca

Please sign in to comment.