Merge branch 'master' into nalc-1.2

This commit is contained in:
2019-05-10 00:36:23 +02:00
24 changed files with 335 additions and 211 deletions

View File

@ -1,7 +1,7 @@
zlib license
============
Copyright (c) 2012-2015 Calinou and contributors
Copyright © 2012-2019 Hugo Locurcio and contributors
**This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.**