Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	Umbraco.gitignore

Author: idseefeld

.travis.yml

@@ -4,7 +4,7 @@ sudo: false
 
 branches:
   only:
-  - master
-  
+    - master
+
 script:
   - ruby -e "puts 'Hello world!'"

Agda.gitignore

@@ -1 +1,2 @@
 *.agdai
+MAlonzo/**

Android.gitignore

@@ -1,5 +1,6 @@
 # Built application files
 *.apk
+*.aar
 *.ap_
 *.aab
 
@@ -13,6 +14,8 @@
 bin/
 gen/
 out/
+#  Uncomment the following line in case you need and you don't have the release build type files in your app
+# release/
 
 # Gradle files
 .gradle/
@@ -41,10 +44,12 @@ captures/
 .idea/assetWizardSettings.xml
 .idea/dictionaries
 .idea/libraries
-.idea/caches
+.idea/jarRepositories.xml
 # Android Studio 3 in .gitignore file.
-.idea/caches/build_file_checksums.ser
+.idea/caches
 .idea/modules.xml
+# Comment next line if keeping position of elements in Navigation Editor is relevant for you
+.idea/navEditor.xml
 
 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.
@@ -53,6 +58,7 @@ captures/
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
+.cxx/
 
 # Google Services (e.g. APIs or Firebase)
 # google-services.json
@@ -78,3 +84,6 @@ lint/generated/
 lint/outputs/
 lint/tmp/
 # lint/reports/
+
+# Android Profiling
+*.hprof

Autotools.gitignore

@@ -6,6 +6,8 @@ Makefile.in
 /py-compile
 /test-driver
 /ylwrap
+.deps/
+.dirstamp
 
 # http://www.gnu.org/software/autoconf
 
@@ -14,6 +16,7 @@ autom4te.cache
 /autoscan-*.log
 /aclocal.m4
 /compile
+/config.cache
 /config.guess
 /config.h.in
 /config.log
@@ -41,3 +44,9 @@ m4/ltoptions.m4
 m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
+
+# Generated Makefile
+# (meta build system like autotools,
+# can automatically generate from config.status script
+# (which is called by configure script))
+Makefile

Concrete5.gitignore

@@ -1,4 +1,21 @@
+# ignore the error log and .htaccess and others
+error_log
+.htaccess
+
+# concrete5 5.6 specific
+
 config/site.php
 files/cache/*
 files/tmp/*
-.htaccess
+
+# concrete5 5.7 specific
+
+# ignore everything but the index.html
+/application/files/*
+!/application/files/index.html
+
+# ignore updates folder
+/updates/*
+
+# ignore sitemap.xml
+/sitemap.xml

Coq.gitignore

@@ -1,4 +1,5 @@
 .*.aux
+.*.d
 *.a
 *.cma
 *.cmi
@@ -9,6 +10,7 @@
 *.glob
 *.ml.d
 *.ml4.d
+*.mlg.d
 *.mli.d
 *.mllib.d
 *.mlpack.d
@@ -17,7 +19,9 @@
 *.v.d
 *.vio
 *.vo
-.coq-native/
+*.vok
+*.vos
+.coq-native
 .csdp.cache
 .lia.cache
 .nia.cache
@@ -28,3 +32,14 @@ lia.cache
 nia.cache
 nlia.cache
 nra.cache
+native_compute_profile_*.data
+
+# generated timing files
+*.timing.diff
+*.v.after-timing
+*.v.before-timing
+*.v.timing
+time-of-build-after.log
+time-of-build-before.log
+time-of-build-both.log
+time-of-build-pretty.log

Dart.gitignore

@@ -11,6 +11,9 @@ pubspec.lock
 # If you don't generate documentation locally you can remove this line.
 doc/api/
 
+# dotenv environment variables file
+.env*
+
 # Avoid committing generated Javascript files:
 *.dart.js
 *.info.json      # Produced by the --dump-info flag.
@@ -19,3 +22,6 @@ doc/api/
 *.js_
 *.js.deps
 *.js.map
+
+.flutter-plugins
+.flutter-plugins-dependencies

Drupal.gitignore

@@ -1,6 +1,6 @@
 # gitignore template for Drupal 8 projects
 #
-# earlier versions of Drupal are tracked in `community/Python/`
+# earlier versions of Drupal are tracked in `community/PHP/`
 
 # Ignore configuration files that may contain sensitive information
 /sites/*/*settings*.php
@@ -18,27 +18,30 @@
 /sites/*/tmp
 /sites/*/cache
 
+# Ignore testing related files
+/sites/simpletest
+
 # Ignore drupal core (if not versioning drupal sources)
 /core
+/vendor
 /modules/README.txt
 /profiles/README.txt
+/themes/README.txt
 /sites/README.txt
 /sites/example.sites.php
 /sites/example.settings.local.php
 /sites/development.services.yml
-/themes/README.txt
-/vendor
 /.csslintrc
 /.editorconfig
 /.eslintignore
 /.eslintrc.json
 /.gitattributes
+/.ht.router.php
 /.htaccess
 /autoload.php
-/composer.json
-/composer.lock
 /example.gitignore
 /index.php
+/INSTALL.txt
 /LICENSE.txt
 /README.txt
 /robots.txt

Erlang.gitignore

@@ -1,10 +1,17 @@
 .eunit
-deps
 *.o
 *.beam
 *.plt
 erl_crash.dump
-ebin/*.beam
-rel/example_project
 .concrete/DEV_MODE
+
+# rebar 2.x
 .rebar
+rel/example_project
+ebin/*.beam
+deps
+
+# rebar 3
+.rebar3
+_build/
+_checkouts/

Global/Archives.gitignore

@@ -5,12 +5,15 @@
 *.rar
 *.zip
 *.gz
+*.gzip
 *.tgz
 *.bzip
+*.bzip2
 *.bz2
 *.xz
 *.lzma
 *.cab
+*.xar
 
 # Packing-only formats
 *.iso
@@ -26,3 +29,4 @@
 *.msi
 *.msm
 *.msp
+*.txz