diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-08-11 05:41:58 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-08-11 05:41:58 +0200 |
commit | 775e974b25e1c055ecaba84c50e1fed12e57a82d (patch) | |
tree | 88dc9473cc4e7efedad44682b1eb2e54d1e3e7c2 /.gitignore | |
parent | 2cf54f179c9411b11dabe00f5c831245fbb7a622 (diff) | |
parent | e21453143818389060bf0bd6cfa627c11a63ede5 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -4,5 +4,4 @@ /*.txt *~ *.pyc -.pc |