diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-04-09 20:47:24 +0200 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-04-09 20:47:24 +0200 |
| commit | 63584b6561cbc31095354b06e356f700dcf0e32b (patch) | |
| tree | b8ee17d8bfdc57c3b80b7c918f3431d198939856 /.gitconfig | |
| parent | 3934e9bef20c5c2ad393e20cfff3a5a1b0d24569 (diff) | |
| parent | 9096d1db4c6be9f4a2cc8af99a994c219f25108c (diff) | |
Merge branch 'develop' into notification-title
# Conflicts:
# src/displayapp/screens/Notifications.cpp
Diffstat (limited to '.gitconfig')
0 files changed, 0 insertions, 0 deletions