diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-12 19:23:51 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-12 19:23:51 +0200 |
| commit | f0afbee15380bf5fc242fb3dd5439a9ea9c67d5c (patch) | |
| tree | 7e82c022c157a39232fc590ab2ffa69787f5d260 /.gitignore | |
| parent | Cleanup (diff) | |
| parent | import fixes + code-cleanup (diff) | |
| download | pyload-f0afbee15380bf5fc242fb3dd5439a9ea9c67d5c.tar.xz | |
Merge branch 'pr/n3_ardi69' into 0.4.10
Conflicts:
pyload/plugin/Plugin.py
pyload/webui/app/pyloadweb.py
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 5b222e058..14e8aa543 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ _build/ module/ paver-minilib.zip /setup.sh +/tesseract/ |