summaryrefslogtreecommitdiff
path: root/ishtar_common/model_merging.py
AgeCommit message (Collapse)Author
2015-09-25Imports: manage boolean association on DBÉtienne Loks
2014-11-28Merge action implementation (person and organization)Étienne Loks