diff options
| author | Mitya Selivanov <0x7fffff@guattari.ru> | 2022-08-25 01:21:36 +0400 |
|---|---|---|
| committer | Mitya Selivanov <0x7fffff@guattari.ru> | 2022-08-25 01:21:36 +0400 |
| commit | c0cde2a7f6c63d7d70054f6470084db499b03914 (patch) | |
| tree | 5a1921e97fd8ec5070d25a73109f424d7ad94687 /.gitattributes | |
| parent | d8650979b0aefcb62bc30aa5998d209525a697b6 (diff) | |
| parent | b8b10fec5394b32c6de512edeefea0a700678abe (diff) | |
| download | kit-c0cde2a7f6c63d7d70054f6470084db499b03914.zip | |
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# source/kit_test/test.c
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions