summaryrefslogtreecommitdiff
path: root/packaging/docker/catlfish-merge/Dockerfile
Commit message (Collapse)AuthorAgeFilesLines
* Run merge.sh under supervisord.Linus Nordberg2015-04-011-7/+8
| | | | We want the log.
* add gitLinus Nordberg2015-04-011-1/+1
|
* Dockerfile for merge, first cut.Linus Nordberg2015-04-011-0/+35