Merge branch 'master' into sunburnt
[wolnelektury.git] / apps / search / templatetags / __init__.py