Merge staging/1.1.0 changes back to master.

This commit is contained in:
Nick Couchman 2020-01-20 03:51:47 -05:00
commit a447b3dc1a

2
NOTICE
View File

@ -1,5 +1,5 @@
Apache Guacamole
Copyright 2019 The Apache Software Foundation
Copyright 2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).