diff options
author | Philipp Hagemeister <phihag@phihag.de> | 2015-01-05 18:18:15 +0100 |
---|---|---|
committer | Philipp Hagemeister <phihag@phihag.de> | 2015-01-05 18:18:15 +0100 |
commit | 18c3c15391de27d4dd6e550087ca244d294a9bf2 (patch) | |
tree | b01e0e5cb9bcab0d019daf4a4f51656098c9a7ca /.gitignore | |
parent | dda620e88c68e995afcc3cd35b9d360cb42527a0 (diff) | |
parent | 03ff2cc1c49c82daf2218b76e169c2d679447f03 (diff) |
Merge remote-tracking branch 'Oteng/master'
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 86312d4e4..0422adf44 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,5 @@ updates_key.pem test/testdata .tox youtube-dl.zsh +.idea +.idea/*
\ No newline at end of file |