diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-10-01 20:19:42 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-10-01 20:19:42 +0200 |
commit | b8757ee40b25ad8dac375c35f23785982985c215 (patch) | |
tree | 6ede28c8add650f5fcef3c920de66da2e0cd7c80 /.gitignore | |
parent | 775e974b25e1c055ecaba84c50e1fed12e57a82d (diff) | |
parent | 9a955c414e34de441b5f188520314d54e3c5b3c5 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4,4 +4,4 @@ /*.txt *~ *.pyc - +.pc |