Marcus Moore 6423df2133 Merge branch 'develop' into fixes/custom-field-values ...

# Conflicts:
#	resources/views/livewire/custom-field-set-default-values-for-model.blade.php

2024-09-09 16:07:37 -07:00

..

category-edit-form.blade.php

Fix category edit form component

2024-06-17 14:24:16 -07:00

custom-field-set-default-values-for-model.blade.php

Merge branch 'develop' into fixes/custom-field-values

2024-09-09 16:07:37 -07:00

importer.blade.php

Merge branch 'develop' into livewire-importer-improvements

2024-08-19 14:41:58 -07:00

oauth-clients.blade.php

Settings pages

2024-08-19 14:48:12 +01:00

personal-access-tokens.blade.php

Fixed API key missing translations

2024-07-09 13:17:46 +01:00

slack-settings-form.blade.php

Updated icons

2024-08-18 17:26:44 +01:00