diff options
author | Walter Purcaro <vuolter@gmail.com> | 2014-04-11 11:55:03 +0200 |
---|---|---|
committer | Stefano <l.stickell@yahoo.it> | 2014-04-21 17:17:41 +0200 |
commit | c46b882d9124fab8795b6094d928e76f6d21ae8c (patch) | |
tree | db58d7e3ca34af104ad603cdd7fad81dfd74be92 /.gitattributes | |
parent | Fix __author_name__ and __author_mail__ (diff) | |
download | pyload-c46b882d9124fab8795b6094d928e76f6d21ae8c.tar.xz |
Fix __description__
Merges vuolter/pyload@74bcc70
(cherry picked from commit cca4127f9853ab029cbf0b55fedced124400952d)
Conflicts:
module/plugins/Account.py
module/plugins/Container.py
module/plugins/Crypter.py
module/plugins/Hook.py
module/plugins/Plugin.py
module/plugins/container/LinkList.py
pyload/plugins/crypter/HoerbuchIn.py
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions