diff options
| author | emkael <emkael@tlen.pl> | 2018-02-04 15:05:49 +0100 |
|---|---|---|
| committer | emkael <emkael@tlen.pl> | 2018-02-04 15:05:49 +0100 |
| commit | 3ffed804b0db02cbbc365c3fcc7ebd6336fd8247 (patch) | |
| tree | 6d30524649949cfb93dcd9a3d918fe0eafac526e /Aktywator/Resources | |
| parent | f8d681f86db438cc2d8749e89d8ef3909ece8ca6 (diff) | |
| parent | fa8e46acc24c5cf8b607531684b4c9858e4ebb33 (diff) | |
Merge branch 'master' of github.com:michzimny/aktywator into upstream
Conflicts:
Aktywator/Resources/BuildDate.txt
Diffstat (limited to 'Aktywator/Resources')
| -rw-r--r-- | Aktywator/Resources/BuildDate.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index fb76437..a374121 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2018-02-04 +2018-02-04 |