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

merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-01-19 12:48:51 +01:00
parent f83ef8201f 706729155c
commit 1800b5b4a9
11 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "39f1884aa",
"SHA": "39f1884aac462aefbe93eec560febe4636b13b1a",
"shortSHA": "f83ef8201",
"SHA": "f83ef8201fffa4d964d7293d17004c90e6429d7d",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Thu Jan 19 12:05:14 2023 +0100'",
"lastCommitMessage": "fix create action mobile",
"lastCommitNumber": "4661",
"lastCommitTime": "'Thu Jan 19 12:47:00 2023 +0100'",
"lastCommitMessage": "fix chat",
"lastCommitNumber": "4662",
"change": "",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html",
"changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.ts\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.html\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}