diff options
| author | Crystalwarrior <varsash@gmail.com> | 2021-01-19 16:04:58 +0300 |
|---|---|---|
| committer | Crystalwarrior <varsash@gmail.com> | 2021-01-19 16:04:58 +0300 |
| commit | 1b016ddf91cb8b065215d046e7e0b4064b5d8633 (patch) | |
| tree | 39ea2ed35b536bdd5a06141398eb3bc379fccd09 /.gitignore | |
| parent | 07993a621b046985ee39ddef1427d8b4cc6042b1 (diff) | |
| parent | 0926f3c15842a71002c0ec374fd54832469036d8 (diff) | |
Merge branch 'master' into feature/timerclock
# Conflicts:
# include/courtroom.h
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions