Public Git Hosting - mygpo.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 62c3d94 f1844c8)

commit	719929c662aec1fc421ca0ebaddc1ed2f1db19cf
author	Stefan Kögl <stefan@skoegl.net>
	Thu, 26 Oct 2017 10:25:06 +0000 (26 12:25 +0200)
committer	Stefan Kögl <stefan@skoegl.net>
	Thu, 26 Oct 2017 10:25:06 +0000 (26 12:25 +0200)
tree	e1dadc37688302c7311cb80cce57c60c0c4f906d	tree \| snapshot (tar.gz zip)
parent	62c3d94150d55c4d9fb88896bf059777ff57079e	commit \| diff
parent	f1844c8ffa5f17102474e6ba9d621ab6ba95d5f4	commit \| diff

Merge branch 'master' into django2

mygpo/directory/urls.py	diff1 \|	diff2 \|	blob \| history
mygpo/podcasts/urls.py	diff1 \|	diff2 \|	blob \| history
mygpo/users/urls.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/templatetags/menu.py	diff1 \|	diff2 \|	blob \| history

gpodder.net is a webservice that connects podcast players