Merge branch 'MASQ-Project:master' into master

masqrauder · Apr 10, 2022 · 1977ac5 · 1977ac5
2 parents 6245f24 + f4d4146
commit 1977ac5
Show file tree

Hide file tree

Showing 407 changed files with 41,543 additions and 13,346 deletions.
diff --git a/.gitignore b/.gitignore
@@ -67,12 +67,17 @@ Temporary Items
 **/.idea/**/sqlDataSources.xml
 **/.idea/**/dynamic.xml
 **/.idea/**/uiDesigner.xml
+**/.idea/**/runConfigurations.xml
 **/.idea/httpRequests/
 
 # Gradle:
 **/.idea/**/gradle.xml
 **/.idea/**/libraries
 
+# Azure:
+**/.idea/**/azure/
+**/.idea/**/azureSettings.xml
+
 # CMake
 cmake-build-debug/
 

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
                     GNU GENERAL PUBLIC LICENSE
 
-Copyright (c) 2019-2021 MASQ Project
+Copyright (c) 2019 MASQ Project
 
 MASQ Node and code under MASQ Project (https://github.com/MASQ-Project) is licensed under the GNU GPL, version 3
 
@@ -15,7 +15,7 @@ File Copyrights
 All files not explicitly mentioned below
     What: MASQ Project
     Source URL: https://github.com/MASQ-Project
-    Copyright: MASQ Project 2019-2020
+    Copyright: MASQ Project 2019, (https://masq.ai)
     License: GNU GPLv3
     License text: See below
 

diff --git a/USER-INTERFACE-INTERFACE.md b/USER-INTERFACE-INTERFACE.md
diff --git a/automap/.gitignore b/automap/.gitignore
@@ -0,0 +1 @@
+automap.log