Merge branch 'master' into multiple-texture-type-to-string-definitions

pull/2989/head
Marc-Antoine Lortie 2020-02-07 17:37:10 -05:00 committed by GitHub
commit 95a7772b5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

2
.github/FUNDING.yml vendored
View File

@ -1,2 +1,2 @@
patreon: assimp patreon: assimp
ko_fi: kimkulling Paypal: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4JRJVPXC4QJM4