summaryrefslogtreecommitdiffhomepage
path: root/ui/src/main/res
diff options
context:
space:
mode:
authorMikael Magnusson <mikma@users.sourceforge.net>2023-05-09 01:39:47 +0200
committerMikael Magnusson <mikma@users.sourceforge.net>2023-05-09 01:39:47 +0200
commit7cc56f038706b4b6dd543b9f6305cafb167ba250 (patch)
treed3ea6a067dc1c91e3aaa0e0183c904a6bdc37bef /ui/src/main/res
parent5419a62f19c984beaada575d9ab53662e39325e4 (diff)
parentfee2d9dec12dd9e5a8a8b25537ec1b389bfeb1e5 (diff)
parent1b6bc7a18f614bc9e1aad6a234d5ad4a399be56e (diff)
Merge branches 'm7n' and 'version' into build13build13