|
dccc9fdbef
|
Merge branch 'cuttingedge-merge-ServerV2' into postgres-Server-V2
# Conflicts:
# API/MangaDownloadClients/ChromiumDownloadClient.cs
# Tranga/Jobs/JobBoss.cs
# Tranga/Tranga.csproj
|
2025-02-09 18:38:46 +01:00 |
|
|
be6b3da1be
|
Merge branch 'cuttingedge-merge-ServerV2' into postgres-Server-V2
# Conflicts:
# API/MangaDownloadClients/ChromiumDownloadClient.cs
# Tranga/TrangaSettings.cs
|
2025-01-15 23:14:51 +01:00 |
|
|
b818f63f2a
|
Merge branch 'cuttingedge-merge-ServerV2' into postgres-Server-V2
# Conflicts:
# API/MangaDownloadClients/ChromiumDownloadClient.cs
# Tranga/TrangaSettings.cs
|
2025-01-15 22:56:25 +01:00 |
|
|
1008da7ee8
|
Add API
|
2024-12-14 21:53:29 +01:00 |
|