Merge branch 'master' into 14360-dispatch-cloud
[arvados.git] / .licenseignore
index 113bf4fa4e5f2196f74a9609d4805117392d85a3..06519a98e8bc45afcebdad584198a6b6bb47bf71 100644 (file)
@@ -13,6 +13,7 @@ build/package-test-dockerfiles/ubuntu1604/etc-apt-preferences.d-arvados
 *by-sa-3.0.txt
 *COPYING
 doc/fonts/*
+doc/user/cwl/federated/*
 */docker_image
 docker/jobs/apt.arvados.org.list
 */en.bootstrap.yml
@@ -70,3 +71,5 @@ sdk/R/NAMESPACE
 sdk/R/.Rbuildignore
 sdk/R/ArvadosR.Rproj
 *.Rd
+lib/dispatchcloud/test/sshkey_*
+*.asc