summaryrefslogtreecommitdiff
path: root/ishtar_common/templates/ishtar/merge.html
AgeCommit message (Expand)Author
2014-11-28Merge action implementation (person and organization)Étienne Loks