summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2018-02-04 15:05:49 +0100
committeremkael <emkael@tlen.pl>2018-02-04 15:05:49 +0100
commit3ffed804b0db02cbbc365c3fcc7ebd6336fd8247 (patch)
tree6d30524649949cfb93dcd9a3d918fe0eafac526e /.gitignore
parentf8d681f86db438cc2d8749e89d8ef3909ece8ca6 (diff)
parentfa8e46acc24c5cf8b607531684b4c9858e4ebb33 (diff)
Merge branch 'master' of github.com:michzimny/aktywator into upstream
Conflicts: Aktywator/Resources/BuildDate.txt
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions