diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-08-06 20:18:23 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-08-06 20:18:23 +0200 |
| commit | 2cf54f179c9411b11dabe00f5c831245fbb7a622 (patch) | |
| tree | cbdbcbbbee31a3e71153b2eddf432f99fdad2a29 /.gitignore | |
| parent | 18449d7dd31123e14f8a0d87047f2f85187a156b (diff) | |
| parent | 6c03e9d2fa808b9c5a223c4d01f4d0b848fe97f1 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -4,6 +4,5 @@ /*.txt *~ *.pyc -.bzrignore -.bzr .pc + |