Solve conflicts/merge upstream
This commit is contained in:
commit
586c652eab
4 changed files with 310 additions and 152 deletions
|
|
@ -1,6 +1,6 @@
|
|||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2015-2020 Dylan Araps
|
||||
Copyright (c) 2015-2021 Dylan Araps
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue