Merge branch 'master' into master-merge

Retaining older version of udpt...
This merge also replaces UDPT's license from GPLv3 to MIT.
This commit is contained in:
Naim A 2018-12-07 02:11:23 +02:00
commit c12d91cfc5
No known key found for this signature in database
GPG key ID: FD7948915D9EF8B9
2 changed files with 29 additions and 28 deletions

View file

@ -1,3 +1,4 @@
<<<<<<< HEAD
MIT License MIT License
Copyright (c) 2018 Naim A. Copyright (c) 2018 Naim A.