peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-06-30 10:49:33 +01:00
parent bde8a32f4d b9bd42e138
commit 89e11c6fe4
12 changed files with 250 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files
version/git-version.ts
+7 -7
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "246ea2e4a",
"SHA": "246ea2e4a60c3c62f40de45c32e2593edd6a8467",
"branch": "feature/chat-fix",
"shortSHA": "bde8a32f4",
"SHA": "bde8a32f4d1e0f7720c6db9e546d084e1f6e4c08",
"branch": "developer",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Thu Jun 29 16:04:44 2023 +0100'",
"lastCommitMessage": "fixe chat message",
"lastCommitNumber": "5022",
"lastCommitTime": "'Fri Jun 30 10:44:41 2023 +0100'",
"lastCommitMessage": "fix",
"lastCommitNumber": "5023",
"change": "",
"changeStatus": "On branch feature/chat-fix\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/shared/agenda/view-event/view-event.page.html",
"changeStatus": "On branch developer\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/app.component.ts\n\tmodified: src/app/app.module.ts\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/services/contacts.service.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/shared/header/header.page.ts\n\tmodified: src/environments/suport/oapr.ts\n\tnew file: src/firebase-config.ts\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}