Marcus Moore 530ea474d1 Merge branch 'develop' into saving_custom_report_template ... # Conflicts: # resources/lang/en/admin/reports/general.php # resources/views/reports/custom.blade.php		2024-01-23 13:55:07 -08:00
..
forms	Merge branch 'develop' into saving_custom_report_template	2024-01-23 13:55:07 -08:00
asset-bulk-actions.blade.php	Fixed [FD-39640]: preserve sort order when generating asset labels	2024-01-09 16:37:33 +00:00
assets-assigned.blade.php	Fixed #12772 - use the APP_URL config more consistently	2023-04-05 16:05:40 -07:00
bootstrap-table.blade.php	Fixed [FD-39640]: preserve sort order when generating asset labels	2024-01-09 16:37:33 +00:00
bpay.blade.php	Update bpay.blade.php	2023-04-07 10:15:34 +02:00
label2-field-definitions.blade.php	Re-order options	2023-09-28 12:33:27 -07:00
label2-preview.blade.php	Add "Pop Out" button for preview	2022-11-12 19:02:38 +08:00
models-bulk-actions.blade.php
more-info.blade.php
users-bulk-actions.blade.php	Fixed min width on select2 bulk menus	2023-03-18 00:14:57 -07:00