Merge branch 'main' of git.odit.services:lfk/scanclient-electron into main

# Conflicts: # .drone.yml
Now explicitly pushing tags
2021-04-07 18:33:07 +02:00 · 2021-04-07 18:32:48 +02:00
2 changed files with 2 additions and 1 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -75,6 +75,7 @@ steps:
    image: appleboy/drone-git-push
    settings:
      followtags: true
+      branch: ${SOURCE_TAG}
      remote: git@git.odit.services:lfk/scanclient-electron.git
      ssh_key:
        from_secret: git_ssh
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "@lfk/scanclient-electron",
-	"version": "0.0.4",
+	"version": "0.0.3",
 	"description": "minimal electron application",
 	"main": "main.js",
 	"scripts": {
Author	SHA1	Message	Date
Nicolai Ort	03a9810f48	Merge branch 'main' of git.odit.services:lfk/scanclient-electron into main All checks were successful continuous-integration/drone Build is passing Details # Conflicts: # .drone.yml	2021-04-07 18:33:07 +02:00
Nicolai Ort	fed8eb939b	Now explicitly pushing tags ref #1	2021-04-07 18:32:48 +02:00