| Age | Commit message (Collapse) | Author |
|---|
|
|
|
Conflicts:
ishtar_common/migrations/0030_auto__add_state__chg_field_sourcetype_txt_idx__chg_field_authortype_tx.py
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
archaeological_warehouse/migrations/0020_generate_cache_lbl_for_containers.py
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
archaeological_warehouse/migrations/0004_auto__chg_field_container_responsible.py
|
|
|
|
|
|
|
|
|
|
Conflicts:
archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for treatment and treatment files (refs #3384)
|
|
|
|
|
|
|
|
|
|
|
