snipe 5bc5e9f108 Merge remote-tracking branch 'origin/develop' ...

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/lang/en/admin/locations/general.php

2022-06-05 17:14:31 -07:00

..

general.php

Merge remote-tracking branch 'origin/develop'

2022-06-05 17:14:31 -07: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