Merge pull request #2 from devopsdays/master

[CAI-2020] Getting latest
devopsdays · Sep 25, 2019 · 4dd8371 · 4dd8371
2 parents 04563e1 + 51d4efa
commit 4dd8371
Show file tree

Hide file tree

Showing 7,663 changed files with 848,126 additions and 81,684 deletions.
diff --git a/.mention-bot b/.mention-bot
@@ -6,22 +6,22 @@
   "alwaysNotifyForPaths": [
     {
       "name": "mattstratton",
-      "files": [".gitignore","config.toml","config-windows.toml", "gulpfile.js", "utilities/**/*", "themes/**/*", "content/page/**/*", "static/_redirects", "data/core.toml", ".circleci/config.yml"], 
+      "files": [".gitignore","config.toml","config-windows.toml", "netlify.toml", "gulpfile.js", "utilities/**/*", "themes/**/*", "content/page/**/*", "static/_redirects", "data/core.toml", ".circleci/config.yml"], 
       "skipTeamPrs": true 
     },
         {
       "name": "MikeRosTX",
-      "files": [".gitignore","config.toml","config-windows.toml", "themes/**/*", "content/page/**/*"], 
+      "files": [".gitignore","config.toml","config-windows.toml", "netlify.toml", "themes/**/*", "content/page/**/*"], 
       "skipTeamPrs": true 
     },
         {
       "name": "phrawzty",
-      "files": [".gitignore","config.toml","config-windows.toml",  "themes/**/*", "content/page/**/*"], 
+      "files": [".gitignore","config.toml","config-windows.toml", "netlify.toml",  "themes/**/*", "content/page/**/*"], 
       "skipTeamPrs": true 
     },
     {
       "name": "bridgetkromhout",
-      "files": [".gitignore","config.toml","config-windows.toml", "utilities/**/*", "themes/**/*", "content/page/**/*", "data/core.toml"],
+      "files": [".gitignore","config.toml","config-windows.toml", "netlify.toml", "utilities/**/*", "themes/**/*", "content/page/**/*", "data/core.toml"],
       "skipTeamPrs": false
      }
   ],

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright [2016] [devopsdays]
+Copyright [2016-2019] [devopsdays]
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,14 +16,13 @@ This project includes bootstrap and which is available under a 'MIT' License.
 For details, see:
 /LICENSES/BOOTSTRAP-MIT-LICENSE
 
-This project includes bootstrap-sortable and which is available under a 'MIT' License.
+This project includes jssocials, which is available under a 'MIT' License.
 For details, see:
-/LICENSES/BOOTSTRAP-SORTABLE-LICENSE
+/LICENSES/JSSOCIALS-MIT-LICENSE
 
-This project includes hugo-snippets and which is available under a 'MIT' License.
-For details, see:
-/LICENSES/HUGO-SNIPPETS-MIT-LICENSE
+This project includes fonts from Font Awesome, which are available under 'MIT', 'SIL OFL', and 'CC BY' licenses.
+For details, see http://fontawesome.io/license/
 
-This project includes moment and which is available under a 'MIT' License.
-For details, see:
-/LICENSES/MOMENT-MIT-LICENSE
+This project includes jquery, which is available under a 'MIT' license.
+For details, see
+/LICENSES/JQUERY-MIT-LICENSE
diff --git a/LICENSES/BOOSTRAP-SORTABLE-MIT-LICENSE b/LICENSES/BOOSTRAP-SORTABLE-MIT-LICENSE
diff --git a/LICENSES/HUGO-SNIPPETS-MIT-LICENSE b/LICENSES/HUGO-SNIPPETS-MIT-LICENSE
diff --git a/...opsdays-theme/LICENSES/JQUERY-MIT-LICENSE → LICENSES/JQUERY-MIT-LICENSE b/...opsdays-theme/LICENSES/JQUERY-MIT-LICENSE → LICENSES/JQUERY-MIT-LICENSE
diff --git a/...days-theme/LICENSES/JSSOCIALS-MIT-LICENSE → LICENSES/JSSOCIALS-MIT-LICENSE b/...days-theme/LICENSES/JSSOCIALS-MIT-LICENSE → LICENSES/JSSOCIALS-MIT-LICENSE
diff --git a/LICENSES/MOMENT-MIT-LICENSE b/LICENSES/MOMENT-MIT-LICENSE
diff --git a/content/events/2017-amsterdam/conduct.md b/content/events/2017-amsterdam/conduct.md
diff --git a/content/events/2017-amsterdam/contact.md b/content/events/2017-amsterdam/contact.md
diff --git a/content/events/2017-amsterdam/location.md b/content/events/2017-amsterdam/location.md
diff --git a/content/events/2017-amsterdam/postevent.md b/content/events/2017-amsterdam/postevent.md