| Age | Commit message (Collapse) | Author | 
 | 
 | 
 | 
Conflicts:
	archaeological_operations/models.py
 | 
 | 
 | 
 | 
 | 
 | 
Conflicts:
	Makefile.example
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
Conflicts:
	ishtar_common/locale/fr/LC_MESSAGES/django.po
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
Conflicts:
	ishtar_common/locale/fr/LC_MESSAGES/django.po
 | 
 | 
 | 
 | 
Conflicts:
	ishtar_common/locale/fr/LC_MESSAGES/django.po
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
Conflicts:
	ishtar_common/data_importer.py
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 |