Skip to content
Snippets Groups Projects
Commit 768d1dce authored by Christian Pointner's avatar Christian Pointner
Browse files

Merge branch 'master' into stable

parents 82204a17 997372f6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
nop/views.py
+ 2
− 1
View file @ 768d1dce
......@@ -23,7 +23,8 @@ MUSIKPROG_IDS = (
523, # Songbirds
562, # Singing Birds
563, # canzoni italiane
564 # on connait la chanson
564, # on connait la chanson
604 # pussy*whipped
)
SPECIAL_PROGRAM_IDS = (
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment