diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-11-21 07:37:54 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-11-21 07:37:54 +0100 |
| commit | 830e13187681374119971e4efdf694cafc61739d (patch) | |
| tree | 6864a939c8d37bce8afa6f21ae43627603e5d390 /pyload/webui/servers/nginx_default.conf | |
| parent | [Plugin] Fix typo (diff) | |
| parent | Fix cookie domain (diff) | |
| download | pyload-830e13187681374119971e4efdf694cafc61739d.tar.xz | |
Merge branch 'stable' into 0.4.10
Conflicts:
pyload/network/HTTPRequest.py
pyload/plugins/account/UlozTo.py
pyload/plugins/crypter/LinkCryptWs.py
pyload/plugins/internal/SimpleCrypter.py
pyload/plugins/internal/SimpleHoster.py
Diffstat (limited to 'pyload/webui/servers/nginx_default.conf')
0 files changed, 0 insertions, 0 deletions