summaryrefslogtreecommitdiff
path: root/packaging/docker/catlfish-merge
Commit message (Expand)AuthorAgeFilesLines
* Run merge.sh under supervisord.Linus Nordberg2015-04-013-13/+16
* add gitLinus Nordberg2015-04-011-1/+1
* Dockerfile for merge, first cut.Linus Nordberg2015-04-012-0/+65