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

merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-03-09 12:22:54 +01:00
parent 66be958e2d 7c6bd9c0a4
commit 79509a3055
6 changed files with 412 additions and 257 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": "070edbd4f",
"SHA": "070edbd4faf94338eccc488162df486371263948",
"shortSHA": "66be958e2",
"SHA": "66be958e2d7b21b9a80e567bcfc995ec9e53d7cc",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Tue Mar 7 12:31:43 2023 +0100'",
"lastCommitMessage": "fix begin date html erro",
"lastCommitNumber": "4848",
"lastCommitTime": "'Thu Mar 9 12:21:09 2023 +0100'",
"lastCommitMessage": "fix eventos para approvação not opening",
"lastCommitNumber": "4849",
"change": "",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.ts",
"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/add-note/add-note.page.html\n\tmodified: src/app/modals/create-process/create-process.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.html\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}