-
Notifications
You must be signed in to change notification settings - Fork 89
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[SOZ-Phone] Ajout d'une catégorie avec les logos des entreprise dans la liste des Emojis #259
Open
TheAzylium
wants to merge
2,977
commits into
SOZ-Faut-etre-Sub:oss
Choose a base branch
from
TheAzylium:emojiCustom
base: oss
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Vusk42
reviewed
Sep 24, 2023
resources/[soz]/soz-phone/src/nui/apps/society-messages/pages/MessagesList.tsx
Outdated
Show resolved
Hide resolved
|
Resultat: 2023-09-27.23-51-52.mp4 |
Update zones for LSMC v2
november crimi update
…aticket Fix crimi veh siphon
Do not display grades that are not possible to promote to
Change banner on promote menu
Fix binoculars can't PTT
…bag-collect Store stonk bag collect history with citizenId and not source
Resize ZeraGirl illustration to 500x500 ti gain size
…outh fix(appart): Move mlo appart
Feat(map): new apparts on Forum Drive and Peaceful Street
feat(clothes): optimized mipmas; color
[AJOUT] Hameçon détritus
[FIX] ELectric vehicle
[FIX] ELectric vehicle
Always display Cayo may with ExtraMapTiles lib
Always display Cayo may with ExtraMapTiles lib
…ssage Fixing Gunsmith error message
…mmer Fix hammer transder for staff/admin
…itoring Add monitoring event for baun harvest
…antity Fixing giving not whole quantity
Changing info traffic into info trafic
# Conflicts: # resources/[mapping]/[mapping-prod]/soz-mtpetrol-v2/stream/ymap/hei_cs1_02_strm_0.ymap # resources/[soz]/soz-core/src/client/weapon/weapon.gunsmith.provider.ts # resources/[soz]/soz-core/src/nui/components/Menu/Job/MenuNews.tsx # resources/[soz]/soz-inventory/client/player.lua # resources/[soz]/soz-inventory/server/main.lua # resources/[soz]/soz-jobs/server/jobs/baun.lua # resources/[soz]/soz-phone/src/nui/apps/twitch-news/utils/isPolice.ts
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
link to #258