TheOtherP 87cb19f0bb Merge remote-tracking branch 'origin/master' into springboot3 ... # Conflicts: # .gitignore # .idea/compiler.xml # .idea/misc.xml # core/pom.xml # core/src/main/java/org/nzbhydra/update/UpdateManager.java # core/src/main/resources/changelog.json # core/src/main/resources/static/js/nzbhydra.js # core/src/main/resources/static/js/nzbhydra.js.map # core/src/main/resources/static/js/templates.js # core/ui-src/js/directives/hydra-checks-footer.js # misc/build-and-release.cmd # other/mockserver/pom.xml # other/wrapper/pyInstaller/buildWrapper.sh # pom.xml # releases/linux-release/include/nzbhydra2 # releases/linux-release/pom.xml # releases/pom.xml # releases/windows-release/include/NZBHydra2 Console.exe # releases/windows-release/include/NZBHydra2.exe # releases/windows-release/pom.xml # shared/mapping/pom.xml # shared/pom.xml # tests/pom.xml		2023-01-20 09:40:51 +01:00
..
html	Finish moving config classes to separate module	2023-01-04 11:38:48 +01:00
img	Add thank you to newsgroup.ninja	2020-04-17 14:35:44 +02:00
js	Merge remote-tracking branch 'origin/master' into springboot3	2023-01-20 09:40:51 +01:00
less	Fix blue checkboxes.	2021-09-25 10:40:43 +02:00