Merge branch 'geany:master' into master

Author: Alex313031

data/filetype_extensions.conf

@@ -42,7 +42,7 @@ Haskell=*.hs;*.lhs;*.hs-boot;*.lhs-boot;
 Haxe=*.hx;
 HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm;*.tpl;
 Java=*.java;*.jsp;
-Javascript=*.js;*.mjs;
+Javascript=*.js;*.cjs;*.mjs;
 JSON=*.json;
 Julia=*.jl;
 Kotlin=*.kt;*.kts;