Public Git Hosting - mygpo.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 399dbe2 9cc3b64)

commit	9cc6e755170a18dfa2e876fbf13e41e7c0994b47
author	Stefan Kögl <stefan@skoegl.net>
	Fri, 11 Jan 2013 07:47:04 +0000 (11 08:47 +0100)
committer	Stefan Kögl <stefan@skoegl.net>
	Fri, 11 Jan 2013 07:47:04 +0000 (11 08:47 +0100)
tree	32f071853c7b36eda2437a03bc214f53ec0875c5	tree \| snapshot (tar.gz zip)
parent	399dbe2afce5e32d1a0b269c0352956075d24c58	commit \| diff
parent	9cc3b648a3a09a04c931b3d96dcf33eb89bba16c	commit \| diff

Merge branch 'flattr'

Conflicts:
mygpo/utils.py
mygpo/web/views/episode.py
mygpo/web/views/podcast.py

mygpo/api/advanced/__init__.py	diff1 \|	diff2 \|	blob \| history
mygpo/api/backend.py	diff1 \|	diff2 \|	blob \| history
mygpo/core/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/data/feeddownloader.py	diff1 \|	diff2 \|	blob \| history
mygpo/db/couchdb/episode_state.py	diff1 \|	diff2 \|	blob \| history
mygpo/settings.py	diff1 \|	diff2 \|	blob \| history
mygpo/share/views.py	diff1 \|	diff2 \|	blob \| history
mygpo/users/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/utils.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/views/episode.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/views/podcast.py	diff1 \|	diff2 \|	blob \| history

gpodder.net is a webservice that connects podcast players