Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/main/resources/application.properties
This commit is contained in:
redtea committed 2022-08-29 14:47:35 +03:00
commit 94768c8333
12 files changed
+203 -4

No files matched your search

+10
View File
@@ -0,0 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
</body>
</html>