Merge branch 'master' into packaging

[pithos] / snf-pithos-app / pithos / api / templatetags / get_type.py

diff --git a/pithos/api/templatetags/get_type.py b/snf-pithos-app/pithos/api/templatetags/get_type.py
similarity index 100%
rename from pithos/api/templatetags/get_type.py
rename to snf-pithos-app/pithos/api/templatetags/get_type.py