Limnoria

mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-11 12:00:45 +01:00

History

Valentin Lorentz 487f8c8af5 Merge remote-tracking branch 'supybot/master' into testing

Conflicts:
	.mailmap
	README
	docs/FAQ.rst
	plugins/Ctcp/plugin.py
	plugins/Misc/plugin.py
	plugins/Network/plugin.py
	plugins/QuoteGrabs/plugin.py
	plugins/RSS/README.txt
	plugins/Relay/plugin.py
	plugins/ShrinkUrl/config.py
	plugins/ShrinkUrl/plugin.py
	plugins/ShrinkUrl/test.py
	setup.py
	src/callbacks.py
	src/commands.py
	src/conf.py
	test/test_commands.py

2015-05-15 14:41:08 +02:00

locales

ShrinkUrl: Remove xrl.us

2015-01-24 19:33:33 +01:00

__init__.py

Update my name/contact information

2012-09-01 10:16:48 -04:00

config.py

Merge remote-tracking branch 'supybot/master' into testing

2015-05-15 14:41:08 +02:00

messages.pot

ShrinkUrl: Remove xrl.us