Ruud 33602f227d Hope this fixes the crappy merge... ...

Conflicts:

	couchpotato/core/_base/_core/main.py
	couchpotato/core/_base/desktop/main.py

2012-01-14 12:12:54 +01:00

..

static

Logging not working properly. fix #50

2011-10-17 14:07:41 +02:00

__init__.py

Added basic log page

2011-06-04 21:30:45 +02:00

main.py

Hope this fixes the crappy merge...

2012-01-14 12:12:54 +01:00