summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2017-01-12 17:28:03 (GMT)
committerChristian Pointner <equinox@helsinki.at>2017-01-12 17:28:03 (GMT)
commit82204a17ee6feda5fcf4d376ef05bb9f4a8844c5 (patch)
treed6db4a53fb1b45af0a2420ba22388c401c28b10e /.gitignore
parentbee4dba4ed6c8519a9a87027d20d3c3f284ec7fa (diff)
parent1db5125c61ed8ed050b01b7d0944569727a39e48 (diff)
Merge branch 'master' into stable
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions