summaryrefslogtreecommitdiff
path: root/archaeological_operations/migrations/0014_regenerate_cached_label.py
AgeCommit message (Collapse)Author
2017-03-21Merge branch 'master' into v0.9Étienne Loks
Conflicts: Makefile.example archaeological_operations/migrations/0061_regenerate_cached_label.py archaeological_warehouse/migrations/0024_generate_cache_lbl_for_containers.py