Merge branch 'main' into settings-lowest-allowed-user-visiblity

zeripath · web-flow · commit bec0b552a979 · 2021-06-27T19:19:48.000+01:00
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -43,3 +43,4 @@ Kyle Dumont <kdumontnu@gmail.com> (@kdumontnu)
 Patrick Schratz <patrick.schratz@gmail.com> (@pat-s)
 Janis Estelmann <admin@oldschoolhack.me> (@KN4CK3R)
 Steven Kriegler <sk.bunsenbrenner@gmail.com> (@justusbunsi)
+Jimmy Praet <jimmy.praet@telenet.be> (@jpraet)

-Original file line number
+Diff line change
 Patrick Schratz <[email protected]> (@pat-s)
 Janis Estelmann <[email protected]> (@KN4CK3R)
 Steven Kriegler <[email protected]> (@justusbunsi)
 +Jimmy Praet <[email protected]> (@jpraet)