mirror of
https://github.com/Dvorinka/MyClubServer.git
synced 2026-06-03 18:22:57 +00:00
Merge remote master branch - resolved conflicts in cache files and frontend components
This commit is contained in:
File diff suppressed because one or more lines are too long
Vendored
+1
-1
@@ -1 +1 @@
|
||||
{"etag":"","fetched_at":"2025-10-19T15:14:56Z","last_modified":""}
|
||||
{"etag":"","fetched_at":"2025-10-19T15:29:54Z","last_modified":""}
|
||||
+1
-1
@@ -1 +1 @@
|
||||
{"etag":"","fetched_at":"2025-10-19T15:14:56Z","last_modified":""}
|
||||
{"etag":"","fetched_at":"2025-10-19T15:29:54Z","last_modified":""}
|
||||
+1
-1
@@ -1 +1 @@
|
||||
{"etag":"","fetched_at":"2025-10-19T15:14:56Z","last_modified":""}
|
||||
{"etag":"","fetched_at":"2025-10-19T15:29:54Z","last_modified":""}
|
||||
Vendored
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
@@ -1 +1 @@
|
||||
{"etag":"","fetched_at":"2025-10-19T15:14:56Z","last_modified":""}
|
||||
{"etag":"","fetched_at":"2025-10-19T15:29:54Z","last_modified":""}
|
||||
Vendored
+1
-1
@@ -1 +1 @@
|
||||
{"etag":"","fetched_at":"2025-10-19T15:14:56Z","last_modified":""}
|
||||
{"etag":"","fetched_at":"2025-10-19T15:29:54Z","last_modified":""}
|
||||
Vendored
+1
-1
@@ -1 +1 @@
|
||||
{"lastUpdated":"2025-10-19T15:14:56Z"}
|
||||
{"lastUpdated":"2025-10-19T15:29:54Z"}
|
||||
Vendored
+12
-12
@@ -1,7 +1,17 @@
|
||||
{
|
||||
"baseURL": "http://127.0.0.1:8080/api/v1",
|
||||
"duration_ms": 35,
|
||||
"duration_ms": 41,
|
||||
"endpoints": [
|
||||
{
|
||||
"path": "/articles?page=1\u0026page_size=10\u0026published=true",
|
||||
"file": "articles.json",
|
||||
"ok": true
|
||||
},
|
||||
{
|
||||
"path": "/sponsors",
|
||||
"file": "sponsors.json",
|
||||
"ok": true
|
||||
},
|
||||
{
|
||||
"path": "/events/upcoming",
|
||||
"file": "events_upcoming.json",
|
||||
@@ -22,16 +32,6 @@
|
||||
"file": "settings.json",
|
||||
"ok": true
|
||||
},
|
||||
{
|
||||
"path": "/articles?page=1\u0026page_size=10\u0026published=true",
|
||||
"file": "articles.json",
|
||||
"ok": true
|
||||
},
|
||||
{
|
||||
"path": "/sponsors",
|
||||
"file": "sponsors.json",
|
||||
"ok": true
|
||||
},
|
||||
{
|
||||
"path": "/facr/club/football/7eacd9f0-bfa0-4928-a9b6-936140168f58",
|
||||
"file": "facr_club_info.json",
|
||||
@@ -43,5 +43,5 @@
|
||||
"ok": true
|
||||
}
|
||||
],
|
||||
"lastUpdated": "2025-10-19T15:14:56Z"
|
||||
"lastUpdated": "2025-10-19T15:29:54Z"
|
||||
}
|
||||
Vendored
+1
-1
@@ -1 +1 @@
|
||||
{"etag":"","fetched_at":"2025-10-19T15:14:56Z","last_modified":""}
|
||||
{"etag":"","fetched_at":"2025-10-19T15:29:54Z","last_modified":""}
|
||||
Vendored
+1
-1
@@ -1 +1 @@
|
||||
{"etag":"","fetched_at":"2025-10-19T15:14:56Z","last_modified":""}
|
||||
{"etag":"","fetched_at":"2025-10-19T15:29:54Z","last_modified":""}
|
||||
+1
-1
@@ -1 +1 @@
|
||||
{"etag":"","fetched_at":"2025-10-19T15:14:56Z","last_modified":""}
|
||||
{"etag":"","fetched_at":"2025-10-19T15:29:54Z","last_modified":""}
|
||||
Reference in New Issue
Block a user