Commit graph

1135 commits

Author SHA1 Message Date
949bffcf48 Merge branch 'main' into devel 2023-09-10 10:58:34 +02:00
1331b69013 remove kbar, add flop, clean up 2023-09-10 10:58:08 +02:00
f548c24487 Merge pull request 'devel' (#307) from devel into main
Reviewed-on: #307
2023-09-09 23:47:31 +02:00
0b43c3916c Merge branch 'main' into devel 2023-09-09 23:47:24 +02:00
106f86521c generate excerpt from <!-- more --> placeholder 2023-09-09 23:46:59 +02:00
ad0d130fc8 improve outline rendering 2023-09-09 23:46:37 +02:00
4813936ff4 Merge pull request 'notes linking here' (#306) from devel into main
Reviewed-on: #306
2023-09-09 16:18:32 +02:00
11467a2d6f Merge branch 'main' into devel 2023-09-09 16:18:24 +02:00
8775a9d825 notes linking here 2023-09-09 16:17:53 +02:00
d9d2168639 Merge pull request 'devel' (#305) from devel into main
Reviewed-on: #305
2023-09-09 16:10:28 +02:00
55ac50b43a Merge branch 'main' into devel 2023-09-09 16:10:21 +02:00
a0a3a6b479 Merge remote-tracking branch 'origin/devel' into devel 2023-09-09 16:08:38 +02:00
58f5bd364c burst of energy 2023-09-09 16:08:30 +02:00
4f05d2b3dd Merge pull request 'devel' (#304) from devel into main
Reviewed-on: #304
2023-09-09 15:12:05 +02:00
24074b0015 Merge branch 'main' into devel 2023-09-09 15:11:56 +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
a160d402e1 Merge pull request 'devel' (#303) from devel into main
Reviewed-on: #303
2023-09-09 14:37:57 +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