Merge branch 'master' into patch-2

12 files changed, 34 insertions, 14 deletions

diff --git a/Android.gitignore b/Android.gitignore
index addf405e..d5713722 100644
--- a/Android.gitignore
+++ b/Android.gitignore
@@ -54,3 +54,10 @@ google-services.json
 freeline.py
 freeline/
 freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
diff --git a/Dart.gitignore b/Dart.gitignore
index 4d2a4d6d..7bf00e82 100644
--- a/Dart.gitignore
+++ b/Dart.gitignore
@@ -1,6 +1,7 @@
-# See https://www.dartlang.org/tools/private-files.html
+# See https://www.dartlang.org/guides/libraries/private-files
 
 # Files and directories created by pub
+.dart_tool/
 .packages
 .pub/
 build/
diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore
index a30eacf1..9c01e12b 100644
--- a/Global/JetBrains.gitignore
+++ b/Global/JetBrains.gitignore
@@ -1,4 +1,4 @@
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff:
@@ -9,7 +9,6 @@
 # Sensitive or high-churn files:
 .idea/**/dataSources/
 .idea/**/dataSources.ids
-.idea/**/dataSources.xml
 .idea/**/dataSources.local.xml
 .idea/**/sqlDataSources.xml
 .idea/**/dynamic.xml
diff --git a/Go.gitignore b/Go.gitignore
index ea58090b..f1c181ec 100644
--- a/Go.gitignore
+++ b/Go.gitignore
@@ -1,5 +1,6 @@
 # Binaries for programs and plugins
 *.exe
+*.exe~
 *.dll
 *.so
 *.dylib
diff --git a/Node.gitignore b/Node.gitignore
index 2ceae0f2..90f8428b 100644
--- a/Node.gitignore
+++ b/Node.gitignore
@@ -59,3 +59,6 @@ typings/
 
 # parcel-bundler cache (https://parceljs.org/)
 .cache
+
+# next.js build output
+.next
diff --git a/Python.gitignore b/Python.gitignore
index af2f5375..b989be6c 100644
--- a/Python.gitignore
+++ b/Python.gitignore
@@ -45,6 +45,7 @@ nosetests.xml
 coverage.xml
 *.cover
 .hypothesis/
+.pytest_cache/
 
 # Translations
 *.mo
diff --git a/Qt.gitignore b/Qt.gitignore
index 037a1e75..5291a385 100644
--- a/Qt.gitignore
+++ b/Qt.gitignore
@@ -1,5 +1,4 @@
 # C++ objects and libs
-
 *.slo
 *.lo
 *.o
@@ -11,7 +10,6 @@
 *.dylib
 
 # Qt-es
-
 object_script.*.Release
 object_script.*.Debug
 *_plugin_import.cpp
@@ -35,13 +33,11 @@ Makefile*
 target_wrapper.*
 
 # QtCreator
-
 *.autosave
 
-# QtCtreator Qml
+# QtCreator Qml
 *.qmlproject.user
 *.qmlproject.user.*
 
-# QtCtreator CMake
+# QtCreator CMake
 CMakeLists.txt.user*
-
diff --git a/R.gitignore b/R.gitignore
index fcff087a..26fad6fa 100644
--- a/R.gitignore
+++ b/R.gitignore
@@ -31,3 +31,6 @@ vignettes/*.pdf
 # Temporary files created by R markdown
 *.utf8.md
 *.knit.md
+
+# Shiny token, see https://shiny.rstudio.com/articles/shinyapps.html
+rsconnect/
diff --git a/ROS.gitignore b/ROS.gitignore
index 425641f2..35d74bb7 100644
--- a/ROS.gitignore
+++ b/ROS.gitignore
@@ -13,6 +13,8 @@ msg/*Feedback.msg
 msg/*Goal.msg
 msg/*Result.msg
 msg/_*.py
+build_isolated/
+devel_isolated/
 
 # Generated by dynamic reconfigure
 *.cfgc
diff --git a/TeX.gitignore b/TeX.gitignore
index 9bb63365..78c1c5cd 100644
--- a/TeX.gitignore
+++ b/TeX.gitignore
@@ -10,6 +10,7 @@
 *.fot
 *.cb
 *.cb2
+.*.lb
 
 ## Intermediate documents:
 *.dvi
@@ -109,6 +110,14 @@ acs-*.bib
 *.gaux
 *.gtex
 
+# htlatex
+*.4ct
+*.4tc
+*.idv
+*.lg
+*.trc
+*.xref
+
 # hyperref
 *.brf
 
diff --git a/Umbraco.gitignore b/Umbraco.gitignore
index c0392626..10fc2b4d 100644
--- a/Umbraco.gitignore
+++ b/Umbraco.gitignore
@@ -16,8 +16,8 @@
 
 # Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder)
 # Make sure to include details from VisualStudio.gitignore BEFORE this
-!**/App_Data/[Pp]ackages/
-!**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages
+!**/App_Data/[Pp]ackages/*
+!**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages/*
 
 # ImageProcessor DiskCache 
 **/App_Data/cache/
diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore
index d3d5371b..8e930f59 100644
--- a/VisualStudio.gitignore
+++ b/VisualStudio.gitignore
@@ -237,6 +237,7 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
+ServiceFabricBackup/
 
 # SQL Server files
 *.mdf
@@ -258,9 +259,6 @@ FakesAssemblies/
 .ntvs_analysis.dat
 node_modules/
 
-# TypeScript v1 declaration files
-typings/
-
 # Visual Studio 6 build log
 *.plg