Merge branch 'master' into dev

This commit is contained in:
Mister_Nebula 2020-12-19 16:21:09 +00:00 committed by GitHub
commit 9af66a304b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,3 +1,6 @@
MIT License
Copyright (c) 2015 Unity Technologies
Copyright (c) 2020 Henry Pointer (_nebula or misternebula), Aleksander Waage (AmazingAlek) and Ricardo Lopes (Raicuparta)
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: