← Back to branch summary

~gatoscript-devs/gatoscript/master

~gatoscript-devs/gatoscript/master

Viewing all changes in revision 196.

Committer: Raúl Soriano
Date: 2018-05-03 23:41:07 UTC
mfrom: (193.1.1)
Revision ID: git-v1:66f3cad02102b10db8e9ddb1cf7b57a117b1f025

Resolved merge conflict

files added:
gatoscript/doc/hierarchy.md

gatoscript/gmodules/gcommands.py

files modified:
gatoscript/doc/notes.txt

gatoscript/gatoscript.conf

gatoscript/gmodules/__init__.py

gatoscript/gmodules/antispam.py

gatoscript/gmodules/helper.py

gatoscript/gmodules/highlight.py

gatoscript/gmodules/media.py

gatoscript/gmodules/p2p.py

gatoscript/gmodules/players/banshee.py

gatoscript/gmodules/protections.py

gatoscript/gmodules/sysinfo.py

gatoscript/gmodules/whois.py

instalador

Show diffs side-by-side

added added

removed removed

gatoscript/doc/hierarchy.md

gatoscript/doc/notes.txt

gatoscript/gatoscript.conf

gatoscript/gmodules/__init__.py

gatoscript/gmodules/antispam.py

gatoscript/gmodules/gcommands.py

gatoscript/gmodules/helper.py

gatoscript/gmodules/highlight.py

gatoscript/gmodules/media.py

gatoscript/gmodules/p2p.py

gatoscript/gmodules/players/banshee.py

gatoscript/gmodules/protections.py

gatoscript/gmodules/sysinfo.py

gatoscript/gmodules/whois.py

Older »