Merge branch 'main' into dev

Merge branch 'dev' of git.odit.services:lfk/frontend into dev
new license file version [CI SKIP]
2021-03-26 16:17:51 +00:00 · 2021-03-26 17:15:51 +01:00 · 2021-03-26 16:16:10 +00:00 · 2021-02-19 17:03:02 +00:00
1 changed files with 1 additions and 1 deletions
--- a/public/licenses.json
+++ b/public/licenses.json
Author	SHA1	Message	Date
Nicolai Ort	bc36411993	Merge branch 'main' into dev All checks were successful continuous-integration/drone/push Build is passing Details	2021-03-26 16:17:51 +00:00
Nicolai Ort	48506236bf	Merge branch 'dev' of git.odit.services:lfk/frontend into dev All checks were successful continuous-integration/drone/push Build is passing Details	2021-03-26 17:15:51 +01:00
Nicolai Ort	ded9b589fe	new license file version [CI SKIP]	2021-03-26 16:16:10 +00:00
Philipp Dormann	9aa8e7edff	Merge pull request 'first merge to main 🚀' (#71 ) from dev into main Reviewed-on: #71 Reviewed-by: Nicolai Ort <info@nicolai-ort.com>	2021-02-19 17:03:02 +00:00