Merge branch 'master' of ssh://gitea.b4tman.ru/b4tman/qchgk_web_docker

# Conflicts: # .drone.yml
Merge branch 'rocket'
2023-04-02 17:28:12 +03:00 · 2023-04-02 17:27:32 +03:00 · 2023-04-02 17:22:08 +03:00 · 2023-04-02 17:06:17 +03:00
2 changed files with 2 additions and 2 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -53,4 +53,4 @@ trigger:
  - actix
  event:
  - push
-  - tag
+  - tag
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit b281f85a70a9a741d1a0851deefcb80e6aa22061
+Subproject commit d1cb2187c1a74b394df651cb244cbf93982493cb
Author	SHA1	Message	Date
Dmitry Belyaev	55c1f5c6f0	Merge branch 'master' of ssh://gitea.b4tman.ru/b4tman/qchgk_web_docker continuous-integration/drone/push Build is passing Details # Conflicts: # .drone.yml	2023-04-02 17:28:12 +03:00
Dmitry Belyaev	d01a63a7c0	Merge branch 'rocket'	2023-04-02 17:27:32 +03:00
Dmitry Belyaev	9d24c83c5c	from master continuous-integration/drone/push Build is passing Details	2023-04-02 17:22:08 +03:00
Dmitry Belyaev	ce023126fc	upd app (add cache) continuous-integration/drone/push Build is passing Details	2023-04-02 17:06:17 +03:00