Public Git Hosting - mygpo.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 2ee1b2b e5c3acf)

commit	75f984aa2a638f1c391151afcafb388d3377a9d6
author	Stefan Kögl <stefan@skoegl.net>
	Sat, 22 Jul 2017 18:36:52 +0000 (22 20:36 +0200)
committer	Stefan Kögl <stefan@skoegl.net>
	Sat, 22 Jul 2017 18:36:52 +0000 (22 20:36 +0200)
tree	472d397fd1a6f5f8b05887f1cb462596f0497b7e	tree \| snapshot (tar.gz zip)
parent	2ee1b2b344045d4ac9ceea100fa3dbabb3e221f0	commit \| diff
parent	e5c3acf79e34313d65980f47d5a711709b8806ae	commit \| diff

Merge branch 'master' into django-1.10

mygpo/administration/auth.py	diff1 \|	diff2 \|	blob \| history
mygpo/api/__init__.py	diff1 \|	diff2 \|	blob \| history
mygpo/api/advanced/updates.py	diff1 \|	diff2 \|	blob \| history
mygpo/api/basic_auth.py	diff1 \|	diff2 \|	blob \| history
mygpo/podcasts/views/episode.py	diff1 \|	diff2 \|	blob \| history
mygpo/publisher/auth.py	diff1 \|	diff2 \|	blob \| history
mygpo/publisher/utils.py	diff1 \|	diff2 \|	blob \| history
mygpo/settings.py	diff1 \|	diff2 \|	blob \| history
mygpo/users/views/user.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/logo.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/views.py	diff1 \|	diff2 \|	blob \| history

gpodder.net is a webservice that connects podcast players