Commit graph

1120 commits

Author SHA1 Message Date
58f5bd364c burst of energy 2023-09-09 16:08:30 +02:00
d822f6ecb2 Merge remote-tracking branch 'origin/devel' into devel 2023-09-09 15:06:25 +02:00
89ed7fced0 tags 2023-09-09 15:06:16 +02:00
02cb5c3e7a Merge branch 'main' into devel 2023-09-09 14:37:51 +02:00
9ac8cedee2 Merge remote-tracking branch 'origin/devel' into devel 2023-09-09 14:37:32 +02:00
fa495b68e9 yeah 2023-09-09 14:37:26 +02:00
42c85eec91 Merge pull request 'ko' (#302) from devel into main
Reviewed-on: #302
2023-09-09 14:17:25 +02:00
396f882c6d Merge branch 'main' into devel 2023-09-09 14:17:19 +02:00
347b37b3be ko 2023-09-09 14:16:58 +02:00
c468c7a7c1 Merge pull request 'devel' (#301) from devel into main
Reviewed-on: #301
2023-09-09 14:15:27 +02:00
60afdf9d15 Merge branch 'main' into devel 2023-09-09 14:15:18 +02:00
6e04014c5e Merge remote-tracking branch 'origin/devel' into devel 2023-09-09 14:14:55 +02:00
3a0c0764c5 kop 2023-09-09 14:14:37 +02:00
5a78c61e0c Merge pull request 'devel' (#300) from devel into main
Reviewed-on: #300
2023-09-09 14:12:34 +02:00
c60ed1290c Merge branch 'main' into devel 2023-09-09 14:12:20 +02:00
d197560b57 Merge remote-tracking branch 'origin/devel' into devel 2023-09-09 14:12:05 +02:00
01b007f915 ko 2023-09-09 14:11:55 +02:00
4612c9d91b Merge pull request 'devl' (#299) from devel into main
Reviewed-on: #299
2023-09-09 14:10:10 +02:00
7ba85e9e12 Merge branch 'main' into devel 2023-09-09 14:10:04 +02:00
f3b2a92e66 Merge remote-tracking branch 'origin/devel' into devel 2023-09-09 14:09:36 +02:00
12e36d616f bla 2023-09-09 14:09:28 +02:00
62d1502901 Merge pull request 'fix styles' (#298) from devel into main
Reviewed-on: #298
2023-09-09 13:56:33 +02:00
0b6ce9685f Merge branch 'main' into devel 2023-09-09 13:56:27 +02:00
cd17769668 fix styles 2023-09-09 13:56:11 +02:00
60f27620da Merge pull request 'devel' (#297) from devel into main
Reviewed-on: #297
2023-09-09 13:49:39 +02:00
087f0f35f8 Merge branch 'main' into devel 2023-09-09 13:49:32 +02:00
82dfecd0ad Merge remote-tracking branch 'origin/devel' into devel 2023-09-09 13:49:17 +02:00
0d47ecce00 rip and tear 2023-09-09 13:49:08 +02:00
01846f6b8f Merge pull request 'devel' (#296) from devel into main
Reviewed-on: #296
2023-09-09 13:15:01 +02:00
c8a7d1943f Merge branch 'main' into devel 2023-09-09 13:14:56 +02:00
cd3b1dae94 Merge remote-tracking branch 'origin/devel' into devel 2023-09-09 13:14:15 +02:00
a4feb8bba5 react 2023-09-09 13:14:07 +02:00
881679d338 Merge pull request 'lol' (#294) from devel into main
Reviewed-on: #294
2023-09-09 13:06:53 +02:00
fce64036a2 Merge branch 'main' into devel 2023-09-09 13:06:47 +02:00
4c4daf9e28 lol 2023-09-09 13:06:27 +02:00
0c8e62e770 Merge pull request 'devel' (#293) from devel into main
Reviewed-on: #293
2023-09-09 12:55:10 +02:00
8f8ed7568b color 2023-09-09 12:54:47 +02:00
0f83288d63 add nesting 2023-09-09 12:54:42 +02:00
0e10385ee6 Merge pull request 'fix' (#292) from devel into main
Reviewed-on: #292
2023-09-09 12:47:47 +02:00
e4bd324be4 fix 2023-09-09 12:47:25 +02:00
02f9c4f4c4 Merge pull request 'devel' (#291) from devel into main
Reviewed-on: #291
2023-09-09 10:59:23 +02:00
2833407c21 Merge branch 'main' into devel 2023-09-09 10:59:19 +02:00
50266b3052 Merge remote-tracking branch 'origin/devel' into devel 2023-09-09 10:58:53 +02:00
a8e3e4acb5 fix 2023-09-09 10:58:44 +02:00
9fafc54df5 Merge pull request 'yay' (#290) from devel into main
Reviewed-on: #290
2023-09-09 10:25:25 +02:00
3da13d2eb1 Merge branch 'main' into devel 2023-09-09 10:24:54 +02:00
c595b20668 yay 2023-09-09 10:24:22 +02:00
3377daadda Merge pull request 'devel' (#289) from devel into main
Reviewed-on: #289
2023-09-08 23:08:05 +02:00
dcf1cb96cf Merge branch 'main' into devel 2023-09-08 23:07:52 +02:00
b33a9f786d fix slfdsivj 2023-09-08 23:01:39 +02:00