snipe 2db6cf85a7 Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php		2022-05-24 15:10:46 -07:00
..
general.php	Normalize array format in en language to the new shitty way	2022-01-13 21:30:35 -08:00
message.php	Updated language strings	2022-05-24 15:07:14 -07:00
table.php	Updated language strings	2022-01-28 12:40:03 -08:00