Public Git Hosting - mygpo.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 89d4f9f 77ba679)

commit	868b6635b1ebc052cad65fceae0b5f50b3fbfd93
author	Stefan Kögl <stefan@skoegl.net>
	Thu, 4 Jun 2015 09:43:06 +0000 (4 11:43 +0200)
committer	Stefan Kögl <stefan@skoegl.net>
	Thu, 4 Jun 2015 09:43:06 +0000 (4 11:43 +0200)
tree	e42aab299d48939547d698ee5168a9590ed29856	tree \| snapshot (tar.gz zip)
parent	89d4f9fabe24e321a530a35585b84e7049aa10d4	commit \| diff
parent	77ba679f362456a48ec5b9f5f439377583ab9841	commit \| diff

Merge branch 'master' into py3

Conflicts:
mygpo/cache.py
mygpo/data/feeddownloader.py

.travis.yml	diff1 \|	diff2 \|	blob \| history
mygpo/api/advanced/__init__.py	diff1 \|	diff2 \|	blob \| history
mygpo/data/feeddownloader.py	diff1 \|	diff2 \|	blob \| history
mygpo/directory/views.py	diff1 \|	diff2 \|	blob \| history
mygpo/podcasts/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/settings.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/views/podcast.py	diff1 \|	diff2 \|	blob \| history
requirements.txt	diff1 \|	diff2 \|	blob \| history

gpodder.net is a webservice that connects podcast players