Merge branch 'master' into develop

This commit is contained in:
Jason Turner 2018-05-29 11:47:12 -06:00
commit 5b66481996
2 changed files with 4 additions and 0 deletions

View File

@ -1,3 +1,5 @@
BSD-3-Clause License
Copyright 2009-2016 Jason Turner
Copyright 2009-2012 Jonathan Turner.

View File

@ -1,3 +1,5 @@
BSD-3-Clause License
Copyright 2009-2016 Jason Turner
Copyright 2009-2012 Jonathan Turner.