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 with developer_prod

Browse Source
This commit is contained in:
Eudes Inácio
2023-08-18 21:17:57 +01:00
parent 471d05653d eb77736a60
commit eb82f5a430
3 changed files with 130 additions and 23 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": "fc83f1dd5",
"SHA": "fc83f1dd5cb04722615efe6a93480b83142920f1",
"shortSHA": "471d05653",
"SHA": "471d05653d40a9c316a6bdcbdce15d9e552d25c0",
"branch": "developer",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Fri Aug 18 12:48:54 2023 +0100'",
"lastCommitMessage": "remove save racunho button and cancelar",
"lastCommitNumber": "5170",
"lastCommitTime": "'Fri Aug 18 20:27:37 2023 +0100'",
"lastCommitMessage": "users picture added",
"lastCommitNumber": "5171",
"change": "",
"changeStatus": "On branch developer\nYour branch is ahead of 'origin/developer' by 1 commit.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: src/assets/images/md.webp\n\tnew file: src/assets/images/presidente.jpeg\n\tnew file: src/assets/images/sg.jpeg",
"changeStatus": "On branch developer\nYour branch and 'origin/developer' have diverged,\nand have 2 and 5 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts",
"changeAuthor": "eudes.inacio"
}