Commit graph

65 commits

Author SHA1 Message Date
Benjamin Bädorf 6e2c227969
Merge branch 'main' into b12f 2021-11-29 17:25:30 +01:00
Benjamin Bädorf 65c8894f47
Remove minimap from nvim, fix mergetool config for git 2021-11-29 17:23:09 +01:00
Benjamin Bädorf 91163d38ed
Allow changing the user description 2021-11-17 12:06:47 +01:00
Benjamin Bädorf cfe5d77f9e
Allow changing the user description 2021-11-17 12:05:50 +01:00
Benjamin Bädorf b890e2d04a
Fix java session variable 2021-11-15 11:39:55 +01:00
Benjamin Bädorf fbdd35283e
Fix java session variable 2021-11-15 11:37:56 +01:00
teutat3s 7271c34320
hammer for fontconfig 2021-10-26 01:19:47 +02:00
Benjamin Bädorf 231abe6af4
Merge branch 'main' into b12f 2021-10-13 19:27:04 +02:00
teutat3s 9d0e9efb47 fix/mimeapps-tweaks (#20)
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/20
Reviewed-by: Benjamin Bädorf <b12f@noreply.example.org>
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
2021-09-22 20:21:11 +00:00
Benjamin Bädorf 9009fa4a52
Merge branch 'b12f-master' into b12f 2021-09-04 16:00:32 +02:00
teutat3s 5aea1e8089
Merge remote-tracking branch 'devos/core' into core 2021-08-23 23:22:55 +02:00
drone 05836bcdf4 Merge remote-tracking branch 'origin/core' into b12f 2021-07-14 00:24:51 +00:00
teutat3s de5d4a223a upstream pub-solar changes from teutat3s (#11)
Co-authored-by: teutat3s <10206665+teutat3s@users.noreply.github.com>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/11
Reviewed-by: Benjamin Bädorf <b12f@noreply.example.org>
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
2021-07-13 17:05:36 +00:00
Benjamin Bädorf e437f7fca6
Merge branch 'core' into b12f 2021-06-14 19:45:03 +02:00
Benjamin Bädorf ddcf369f41
Initial PubSolarOS commit 2021-05-30 21:10:28 +02:00