summaryrefslogtreecommitdiff
path: root/Aktywator/ParyTournament.cs
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2017-07-31 00:59:16 +0200
committeremkael <emkael@tlen.pl>2017-07-31 00:59:16 +0200
commit78864ed771cdd9d27b28c8d903e57717aa9c1e55 (patch)
treec411aaf5fd946e238943a4dc6a9bc53e9e6eb80c /Aktywator/ParyTournament.cs
parentea9027a8e624cc6d0ef193189bf1d7b1e0e13724 (diff)
parentda525e7358c2dce3f779d9c81d7b6d261fc7e954 (diff)
Merge branch 'version-requirements' into 1.1-betav1.1.0-beta
Conflicts: Aktywator.txt Aktywator/MainForm.Designer.cs Aktywator/MainForm.cs
Diffstat (limited to 'Aktywator/ParyTournament.cs')
0 files changed, 0 insertions, 0 deletions