summaryrefslogtreecommitdiffhomepage
path: root/ui/src/main/res
diff options
context:
space:
mode:
authorMikael Magnusson <mikma@users.sourceforge.net>2023-10-26 23:13:04 +0200
committerMikael Magnusson <mikma@users.sourceforge.net>2023-10-26 23:13:04 +0200
commita4384b802883c8850e9911a2d1d129d619edfaad (patch)
tree287023ca9d742ccc3dab1d9866f7aac5476e9321 /ui/src/main/res
parenta8958d34c7e2de096f70ac80c4e098a710dc79f7 (diff)
parentfee2d9dec12dd9e5a8a8b25537ec1b389bfeb1e5 (diff)
parente7a73f171050746efe0798a98e5499028a707c0b (diff)
Merge branches 'm7n' and 'version' into build25build25