diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2019-07-14 10:14:37 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2019-07-14 10:14:37 +0200 |
commit | ed207aea17489d57b7c5c7471ce355e59ab5d1e1 (patch) | |
tree | df236e320cc4426d9cac204283551a17a9183428 /.gitignore | |
parent | 5b672f2e2521b0f0e932c9b3d76b1f2db27c7201 (diff) | |
parent | c6476862b6d55d0b434ecbd215941745f956327b (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 + |