Merge branch 'develop' into 'origin'

# Conflicts: # view/ja/hstrings.php
2019-12-29 13:31:01 +09:00
parent 6f93d9848c fc9a901c4c
commit e1922bd555
41 changed files with 3616 additions and 5 deletions
--- a/view/ja/hstrings.php
+++ b/view/ja/hstrings.php
@@ -2,7 +2,7 @@

 if(! function_exists("string_plural_select_ja")) {
 function string_plural_select_ja($n){
-	return 0;;
+	return 0;
 }}
 App::$rtl = 0;
 App::$strings["plural_function_code"] = "0";