Godfrey M f29a383179 Merge branch 'develop' into seperating_notification_n_mail ... # Conflicts: # app/Notifications/CheckoutConsumableNotification.php		2024-10-23 15:15:14 -07:00
..
assets	Tweaked line height	2024-10-03 17:33:46 +01:00
lang	Use trans_choice on alert menu	2024-10-23 19:14:17 +01:00
macros	Squashed commit of the following:	2024-09-19 16:06:36 +01:00
views	Merge branch 'develop' into seperating_notification_n_mail	2024-10-23 15:15:14 -07:00