Public Git Hosting - mygpo.git/commit

commit	8fc3cf6066b0db9f48a0000604858972f6df298e
author	Stefan Kögl <stefan@skoegl.net>
	Tue, 4 Jul 2017 17:56:25 +0000 (4 19:56 +0200)
committer	Stefan Kögl <stefan@skoegl.net>
	Tue, 4 Jul 2017 17:56:25 +0000 (4 19:56 +0200)
tree	c657ec8da56e8432b4547b46a00ba2589ae709f1	tree \| snapshot (tar.gz zip)
parent	b08147266d487e57f939ebfc3a318ff5a4432ac7	commit \| diff
parent	5cd52a5438d4187b854ef1e49ce36a03f73feebf	commit \| diff

Merge branch 'master' into static-media

gpodder.net is a webservice that connects podcast players

.gitignore	diff1 \|	diff2 \|	blob \| history
htdocs/media/logo/32/pod/podcast-0.png	\|	\|	blob
htdocs/media/logo/32/pod/podcast-1.png	\|	\|	blob
htdocs/media/logo/32/pod/podcast-2.png	\|	\|	blob
htdocs/media/logo/32/pod/podcast-3.png	\|	\|	blob
htdocs/media/logo/32/pod/podcast-4.png	\|	\|	blob
mygpo/settings.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/logo.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/templates/episode-history.html	diff1 \|	diff2 \|	blob \| history
static/screen.css	diff1 \|	diff2 \|	blob \| history