]> git.0d.be Git - panikweb.git/commit - panikweb_templates/templates/news.html
Merge branch 'master' into wip/side-player
authorFrédéric Péters <fpeters@0d.be>
Sun, 6 Oct 2013 18:42:42 +0000 (20:42 +0200)
committerFrédéric Péters <fpeters@0d.be>
Sun, 6 Oct 2013 18:42:42 +0000 (20:42 +0200)
commitaae1abffc0c24f447f4697d1e1cfb693e43cd94d
tree6fea87ed617d7958e3c4d8e45b1c336b20bc4912
parent27b9f1ccfcaaf63873e6daafcafea26f1d7cdce2
parentcc51d80819594436ed4fc98892ac22c7a9b6af97
Merge branch 'master' into wip/side-player
panikweb/paniktags/templatetags/paniktags.py
panikweb/views.py