Build beta 486 #3
Merged
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
Co-authored-by: runner <runner@Mac-1703233954558.local>
L3o-pold
force-pushed
the
build-beta-486
branch
3 times, most recently
from
a38023c to
8d964a5
Compare
L3o-pold
force-pushed
the
build-beta-486
branch
from
8d964a5 to
07bc477
Compare
L3o-pold
force-pushed
the
build-beta-486
branch
from
f262330 to
da4c1db
Compare
L3o-pold
force-pushed
the
build-beta-486
branch
from
3ac9f20 to
877a89a
Compare
* Fix joining channels from the find channels screen * Fix lint --------- Co-authored-by: Mattermost Build <build@mattermost.com>
* Fix MM55258 * Address feedback --------- Co-authored-by: Mattermost Build <build@mattermost.com>
# Conflicts: # android/app/build.gradle # app/actions/websocket/channel.ts # app/components/progressive_image/index.tsx # app/i18n/index.ts # app/managers/session_manager.ts # app/managers/websocket_manager.ts # app/products/calls/connection/websocket_event_handlers.ts # app/products/calls/observers/index.ts # app/screens/channel/index.tsx # app/screens/channel_info/channel_info.tsx # app/utils/url/path.ts # assets/base/i18n/be.json # assets/base/i18n/bg.json # assets/base/i18n/cs.json # assets/base/i18n/de.json # assets/base/i18n/el.json # assets/base/i18n/en_AU.json # assets/base/i18n/es.json # assets/base/i18n/fa.json # assets/base/i18n/fr.json # assets/base/i18n/fy.json # assets/base/i18n/he.json # assets/base/i18n/hr.json # assets/base/i18n/hu.json # assets/base/i18n/it.json # assets/base/i18n/ja.json # assets/base/i18n/kk.json # assets/base/i18n/ko.json # assets/base/i18n/lt.json # assets/base/i18n/ne.json # assets/base/i18n/nl.json # assets/base/i18n/pl.json # assets/base/i18n/pt-BR.json # assets/base/i18n/ro.json # assets/base/i18n/ru.json # assets/base/i18n/sq.json # assets/base/i18n/sv.json # assets/base/i18n/th.json # assets/base/i18n/tr.json # assets/base/i18n/uk.json # assets/base/i18n/vi.json # assets/base/i18n/zh-CN.json # assets/base/i18n/zh-TW.json # ios/Mattermost/Info.plist # ios/MattermostShare/Info.plist # ios/NotificationService/Info.plist # ios/Podfile # ios/Podfile.lock # ios/kChat.xcodeproj/project.pbxproj # ios/kChat.xcworkspace/xcshareddata/swiftpm/Package.resolved # package-lock.json # package.json
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.
Upgrade from upstream