diff options
| author | Mikael Magnusson <mikma@users.sourceforge.net> | 2023-02-09 21:53:55 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikma@users.sourceforge.net> | 2023-02-09 21:53:55 +0100 |
| commit | 86d031c79869022d2301435da5e8d19c15ef0809 (patch) | |
| tree | 1d59221d19b25a15dd5ade484fff14bac7fcfe8b /ui/src/main/java | |
| parent | 88c2f4aee445c641291f83ca3b23a8238110346a (diff) | |
| parent | e228b8ad7a715d65405a5c8d8f5d48767f0dbf52 (diff) | |
| parent | 5742cd19f34584c4eda11f2a40ff3c41474ea340 (diff) | |
Merge branches 'm7n' and 'version' into new2/buildv1.0.20220516-34-g86d031c7new2/build