summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorBernhard Fröhlich <bernhard@cacert.org>2019-01-18 21:29:55 +0100
committerBernhard Fröhlich <bernhard@cacert.org>2019-01-18 21:29:55 +0100
commita3cb4e655f4b53135acabaab9c0eb15aa0929a01 (patch)
tree29d34a2555dba636f96410522cf54d2e4ae59fe9 /.gitignore
parente62578a0961f12eb17e2c8b49b0533b058a372e8 (diff)
parente6d9b5a8da7053051bc40a302e06a351a70b2f14 (diff)
downloadcacert-devel-test2-1260.tar.gz
cacert-devel-test2-1260.tar.xz
cacert-devel-test2-1260.zip
Merge remote-tracking branch 'github/bug-1305' into test2-1260test2-1260
# Conflicts: # pages/index/3.php
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions