mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-17 23:18:27 +02:00
Merge commit 'ee6e5de4358a2c0a2705194cd954f9207ff772cf' into feature/5854_foss_merge
* commit 'ee6e5de4358a2c0a2705194cd954f9207ff772cf': finish version++ version++ Fix a bug where QR codes aren't detected if the camera is too close. (#7762) element-hq/element-meta/issues/2201 - Disable mark as unread - relates to element-hq/element-meta/issues/891 - relates to element-hq/element-ios/issues/7253 Fix dictation when using the Rich Text Editor. (#7752) Prepare for new sprint finish version++ version++ changelog.d: Upgrade MatrixSDK version ([v0.27.6](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.6)). corrected translations Added translation using Weblate (Persian (Old)) Translated using Weblate (Albanian) Translated using Weblate (Chinese (Simplified)) Translated using Weblate (Chinese (Simplified)) Translated using Weblate (Albanian) changelog fix Prepare for new sprint GH actions: remove triaging process and old GH projects # Conflicts: # Config/AppVersion.xcconfig # Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
This commit is contained in:
4
Podfile
4
Podfile
@@ -16,7 +16,7 @@ use_frameworks!
|
||||
# - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI
|
||||
#
|
||||
# Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
|
||||
$matrixSDKVersion = '= 0.27.5'
|
||||
$matrixSDKVersion = '= 0.27.6'
|
||||
# $matrixSDKVersion = :local
|
||||
# $matrixSDKVersion = { :branch => 'develop'}
|
||||
# $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
|
||||
@@ -63,7 +63,7 @@ end
|
||||
def import_SwiftUI_pods
|
||||
pod 'Introspect', '~> 0.1'
|
||||
pod 'DSBottomSheet', '~> 0.3'
|
||||
pod 'ZXingObjC', '~> 3.6.5'
|
||||
pod 'ZXingObjC', '~> 3.6.9'
|
||||
end
|
||||
|
||||
abstract_target 'RiotPods' do
|
||||
|
||||
Reference in New Issue
Block a user