Merge branch '2.6.0'

This commit is contained in:
Tomas Babej 2021-10-02 22:04:54 -04:00
commit c010855bac
No known key found for this signature in database
GPG key ID: B0747C6578F7D2F5
456 changed files with 17264 additions and 12446 deletions

View file

@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
###############################################################################
#
# Copyright 2006 - 2021, Paul Beckingham, Federico Hernandez.
# Copyright 2006 - 2021, Tomas Babej, Paul Beckingham, Federico Hernandez.
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal