summaryrefslogtreecommitdiffhomepage
path: root/app/src/main/java
diff options
context:
space:
mode:
authorMikael Magnusson <mikma@users.sourceforge.net>2023-07-05 21:39:50 +0200
committerMikael Magnusson <mikma@users.sourceforge.net>2023-07-05 21:39:50 +0200
commit01ad50e337c36aba2ce7f1f11420b5b65e862a8c (patch)
tree6fd41892952a47ea39d8ea6e618f04f254be0a49 /app/src/main/java
parentb80fa02a3bd46bfc87eae1878ebe9dda01e8f4a8 (diff)
parentfee2d9dec12dd9e5a8a8b25537ec1b389bfeb1e5 (diff)
parentc559755ff6a434ca76571f5577f123ba4aadf52b (diff)
Merge branches 'm7n' and 'version' into build19build19