git.0d.be Git - panikweb.git/commit

]> git.0d.be Git - panikweb.git/commit

projects / panikweb.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bfd1f5e 45cd454)

author	Frédéric Péters <fpeters@0d.be>
	Sun, 15 Mar 2020 09:12:51 +0000 (10:12 +0100)
committer	Frédéric Péters <fpeters@0d.be>
	Sun, 15 Mar 2020 09:12:51 +0000 (10:12 +0100)
commit	03d2f195aaa894f2a7e8d22d24061321f628ea32
tree	e4ac79a65255fb41ca9e52cd97948acd383ceef9	tree \| snapshot
parent	bfd1f5e367f66e90a2d5aa4090ecef4f28ab3075	commit \| diff
parent	45cd454b2397932b78d98f0518697c53eff1cc14	commit \| diff

Merge remote-tracking branch 'origin/master' into radio-esperanzah-2020

13 files changed:

panikweb/settings.py	diff1 \|	diff2 \|	blob \| history
panikweb/views.py	diff1 \|	diff2 \|	blob \| history
panikweb_templates/locale/fr/LC_MESSAGES/django.po	diff1 \|	diff2 \|	blob \| history
panikweb_templates/static/css/_general.scss	diff1 \|	diff2 \|	blob \| history
panikweb_templates/static/css/_specifics.scss	diff1 \|	diff2 \|	blob \| history
panikweb_templates/static/js/audioPlayer.js	diff1 \|	diff2 \|	blob \| history
panikweb_templates/static/js/specifics.js	diff1 \|	diff2 \|	blob \| history
panikweb_templates/templates/base.html	diff1 \|	diff2 \|	blob \| history
panikweb_templates/templates/emissions/newsitem_detail.html	diff1 \|	diff2 \|	blob \| history
panikweb_templates/templates/grid.html	diff1 \|	diff2 \|	blob \| history
panikweb_templates/templates/includes/audio.html	diff1 \|	diff2 \|	blob \| history
panikweb_templates/templates/includes/player.html	diff1 \|	diff2 \|	blob \| history
panikweb_templates/templates/panikombo/episode_auto_selection.html	diff1 \|	diff2 \|	blob \| history

Site web de Radio Panik (base commune)