chore: merge conflicts

2024-05-13 11:16:13 +05:30
parent 0075c44918 9670dfa916
commit 0d89f51d78
29 changed files with 615 additions and 462 deletions
--- a/frontend/src/pages/ProfileAbout.vue
+++ b/frontend/src/pages/ProfileAbout.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="mt-7">
+	<div class="mt-7 mb-10">
 		<h2 class="mb-3 text-lg font-semibold text-gray-900">
 			{{ __('About') }}
 		</h2>