Merge remote-tracking branch 'origin/dev' into issue/OSOE-37

# Conflicts: # .gitignore # src/Modules/Lombiq.TrainingDemo
Lombiq · Mar 30, 2021 · 58fafb2 · 58fafb2
2 parents 1e45ffd + 5ddbd07
commit 58fafb2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,8 @@
+{
+    "extends": "./src/Utilities/Lombiq.Gulp.Extensions/ESLint/lombiq-base.js",
+
+    "rules": {
+        // Add overriding rules here like this:
+        // "example-rule" : "error"
+    }
+}
diff --git a/.gitignore b/.gitignore
@@ -187,4 +187,5 @@ node_modules/
 !**/wwwroot/.placeholder
 
 src/*.Web/Localization
+/src/package.json
 /.editorconfig
diff --git a/src/Modules/Lombiq.TrainingDemo b/src/Modules/Lombiq.TrainingDemo
diff --git a/src/Utilities/Lombiq.Gulp.Extensions b/src/Utilities/Lombiq.Gulp.Extensions
diff --git a/src/Utilities/Lombiq.Npm.Targets b/src/Utilities/Lombiq.Npm.Targets