Merged from master and reloaded gitignore

This commit is contained in:
Berenguer Montserrat 2019-08-17 08:58:48 +02:00
commit 9d5aa995a1
433 changed files with 2004 additions and 42763 deletions