snipe ef1eb15a91 Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/permissions.php		2022-05-12 09:31:42 -07:00
..
CheckoutKitController.php	Merge remote-tracking branch 'origin/master' into develop	2022-05-12 09:31:42 -07:00
PredefinedKitsController.php	Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO	2022-01-06 12:35:37 +01:00