summaryrefslogtreecommitdiffhomepage
path: root/app/src/main
diff options
context:
space:
mode:
authorMikael Magnusson <mikma@users.sourceforge.net>2024-02-03 23:30:27 +0100
committerMikael Magnusson <mikma@users.sourceforge.net>2024-02-03 23:30:27 +0100
commitee2768b60813d0391fde69a82a80e0b04a7fa878 (patch)
tree82d6f8a3760d7ccd2c83ca544a16d25bbd4c170b /app/src/main
parent9e6e8154e4beada1c51dc3fe42220e50434b98fb (diff)
parentfee2d9dec12dd9e5a8a8b25537ec1b389bfeb1e5 (diff)
parenteb2c6bab18edd35fce867dd6f93baf4182054603 (diff)
Merge branches 'm7n' and 'version' into build27build27