diff options
| author | Pinapelz <donaldshan1@outlook.com> | 2023-04-20 16:04:51 -0700 |
|---|---|---|
| committer | Pinapelz <donaldshan1@outlook.com> | 2023-04-20 16:11:04 -0700 |
| commit | b716755679b4fd2b135c22738cbec7554207acda (patch) | |
| tree | 1d7dddf7bd61902680ff33d140cb5c4d10684e27 /pom.xml | |
| parent | 88259d981826a1a82aaada160d7b6cf1129b3415 (diff) | |
| parent | 45150158fcb60a575c9fc10832f1261d4d542826 (diff) | |
Merge remote-tracking branch 'origin/main'
# Conflicts:
# src/main/java/DownloadConfigPane.java
Diffstat (limited to 'pom.xml')
0 files changed, 0 insertions, 0 deletions