summaryrefslogtreecommitdiffhomepage
path: root/ui/src/main
diff options
context:
space:
mode:
authorMikael Magnusson <mikma@users.sourceforge.net>2023-05-27 21:55:12 +0200
committerMikael Magnusson <mikma@users.sourceforge.net>2023-05-27 21:55:12 +0200
commitf74e422d90bb41be5f0cca71254620b1b122b2b5 (patch)
tree1c9139408c3e902d7ad944e7bd9bc28d19d19412 /ui/src/main
parentba8ba920466787d8bd94b7b078be41b09441543c (diff)
parentfee2d9dec12dd9e5a8a8b25537ec1b389bfeb1e5 (diff)
parentc559755ff6a434ca76571f5577f123ba4aadf52b (diff)
Merge branches 'm7n' and 'version' into build17build17