diff options
| author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-09-04 17:39:19 +0300 |
|---|---|---|
| committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-09-04 17:39:19 +0300 |
| commit | 5c23b5805a25b815458809eab74e47776c3f47ce (patch) | |
| tree | e56a7561ad61c7753faffd9cbd82cf88bdc12326 /src/sitespec.h | |
| parent | f6bbed48aac2f5497d81b33b3444226b8af1b2d3 (diff) | |
| parent | b1621ee3fbd80f386c32e932ba6eb7f10bc3c822 (diff) | |
Merge branch 'dev' into work/v1.7
# Conflicts:
# CMakeLists.txt
# res/about/version.gmi
Diffstat (limited to 'src/sitespec.h')
0 files changed, 0 insertions, 0 deletions