4 commits

Author	SHA1	Message	Date
teutat3s	e6f679387c	Merge branch 'main' into teutat3s	2021-11-29 17:27:38 +01:00
Benjamin Bädorf	65c8894f47	Remove minimap from nvim, fix mergetool config for git	2021-11-29 17:23:09 +01:00
teutat3s	0b25f7b11b	Fix git mergetool	2021-07-20 22:14:24 +02:00
Benjamin Bädorf	ddcf369f41	Initial PubSolarOS commit	2021-05-30 21:10:28 +02:00