Public Git Hosting - mygpo.git/commit

commit	5f724e6cf5e395e75d04fc1756144acb94d35cef
author	Stefan Kögl <stefan@skoegl.net>
	Sun, 31 May 2015 15:12:04 +0000 (31 17:12 +0200)
committer	Stefan Kögl <stefan@skoegl.net>
	Sun, 31 May 2015 15:12:04 +0000 (31 17:12 +0200)
tree	e0474c5e4720d8c84c1949af712f787c8b4c8975	tree \| snapshot (tar.gz zip)
parent	41212ae8c6d2f96d06e4611a794976909c764acf	commit \| diff
parent	9d208a3f771a35aa25a547103ab77023eafcc0c9	commit \| diff

Merge branch 'master' into py3

Conflicts:
mygpo/data/feeddownloader.py
mygpo/web/views/subscriptions.py

23 files changed:

.travis.yml	diff1 \|	diff2 \|	blob \| history
mygpo/api/advanced/directory.py	diff1 \|	diff2 \|	blob \| history
mygpo/core/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/data/feeddownloader.py	diff1 \|	diff2 \|	blob \| history
mygpo/data/flickr.py	diff1 \|	diff2 \|	blob \| history
mygpo/data/tasks.py	diff1 \|	diff2 \|	blob \| history
mygpo/directory/views.py	diff1 \|	diff2 \|	blob \| history
mygpo/history/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/maintenance/merge.py	diff1 \|	diff2 \|	blob \| history
mygpo/podcastlists/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/podcasts/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/podcasts/tests.py	diff1 \|	diff2 \|	blob \| history
mygpo/publisher/management/commands/make-publisher.py	diff1 \|	diff2 \|	blob \| history
mygpo/settings.py	diff1 \|	diff2 \|	blob \| history
mygpo/subscriptions/__init__.py	diff1 \|	diff2 \|	blob \| history
mygpo/subscriptions/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/users/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/users/tests.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/tests.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/utils.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/views/podcast.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/views/subscriptions.py	diff1 \|	diff2 \|	blob \| history
requirements.txt	diff1 \|	diff2 \|	blob \| history

gpodder.net is a webservice that connects podcast players

.travis.yml	diff1 \|	diff2 \|	blob \| history
mygpo/api/advanced/directory.py	diff1 \|	diff2 \|	blob \| history
mygpo/core/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/data/feeddownloader.py	diff1 \|	diff2 \|	blob \| history
mygpo/data/flickr.py	diff1 \|	diff2 \|	blob \| history
mygpo/data/tasks.py	diff1 \|	diff2 \|	blob \| history
mygpo/directory/views.py	diff1 \|	diff2 \|	blob \| history
mygpo/history/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/maintenance/merge.py	diff1 \|	diff2 \|	blob \| history
mygpo/podcastlists/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/podcasts/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/podcasts/tests.py	diff1 \|	diff2 \|	blob \| history
mygpo/publisher/management/commands/make-publisher.py	diff1 \|	diff2 \|	blob \| history
mygpo/settings.py	diff1 \|	diff2 \|	blob \| history
mygpo/subscriptions/__init__.py	diff1 \|	diff2 \|	blob \| history
mygpo/subscriptions/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/users/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/users/tests.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/tests.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/utils.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/views/podcast.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/views/subscriptions.py	diff1 \|	diff2 \|	blob \| history
requirements.txt	diff1 \|	diff2 \|	blob \| history