@Skif-off pushed 1 commit. da71687 Temporary: Fix conflict
-- You are receiving this because you are subscribed to this thread. View it on GitHub: https://github.com/geany/geany/pull/1752/files/bc1bbc30218576a9c6f048f7589634503e873df7..da71687f3d82d9bc58e37e93386ea3bf429c2fad
