diff options
| author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-06-25 16:26:53 +0300 |
|---|---|---|
| committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-06-25 16:26:53 +0300 |
| commit | 5dbc85eaaa1bd0a0fc11dd76a75ece2efe763df5 (patch) | |
| tree | 9721fb7aced603adb10b9bb3f3beb3f8d5fba973 /src/bookmarks.c | |
| parent | 95c527db1484f7758a180c6de051d0182c3b2e81 (diff) | |
| parent | f99a9111170f2ff28383fd3172fdaf4b9a1ba069 (diff) | |
Merge branch 'work/v1.6' into work/serious-unicode
# Conflicts:
# res/fonts/SmolEmoji-Regular.ttf
Diffstat (limited to 'src/bookmarks.c')
0 files changed, 0 insertions, 0 deletions