diff --git a/CHANGELOG.md b/CHANGELOG.md index a4323f73b9..166e5c2df3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added support for random algorithm for sorting home and discover feeds. #759 - Show content from follows when looking for a pub's profile. #790 - Show replies when displaying a profile. #681 +- Added support for registering room aliases #808 ## [1.2.7] 2022-08-19 diff --git a/Planetary.xcodeproj/project.pbxproj b/Planetary.xcodeproj/project.pbxproj index 13c76acbb3..b685543144 100644 --- a/Planetary.xcodeproj/project.pbxproj +++ b/Planetary.xcodeproj/project.pbxproj @@ -5514,7 +5514,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = Resources/FBTT.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 355; DEVELOPMENT_TEAM = GZCZBKH7MY; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -5527,7 +5527,7 @@ "@executable_path/", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 1.2.7; + MARKETING_VERSION = 1.3.0; OTHER_LDFLAGS = "$(inherited)"; SDKROOT = iphoneos; STRIP_SWIFT_SYMBOLS = NO; @@ -5546,7 +5546,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = Resources/FBTT.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 355; DEVELOPMENT_TEAM = GZCZBKH7MY; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -5559,7 +5559,7 @@ "@executable_path/", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 1.2.7; + MARKETING_VERSION = 1.3.0; OTHER_LDFLAGS = "$(inherited)"; SDKROOT = iphoneos; STRIP_SWIFT_SYMBOLS = NO; diff --git a/Resources/Info.plist b/Resources/Info.plist index 432c9e683d..b66a14b067 100644 --- a/Resources/Info.plist +++ b/Resources/Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 354 + 355 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/Resources/Preload.bundle/Feeds/consolidatedFeed.json b/Resources/Preload.bundle/Feeds/consolidatedFeed.json index b8cd77d1a4..4db1561406 100644 --- a/Resources/Preload.bundle/Feeds/consolidatedFeed.json +++ b/Resources/Preload.bundle/Feeds/consolidatedFeed.json @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47fb815e81a97bea523716c163752148760634aec5d872b836aa8ea1ee4183fb -size 1045114 +oid sha256:08d98e911dd4aad8a971e44e729712f6cd59e63dd1fccde0db0eb51f31cb590c +size 1077333 diff --git a/UITests/Info.plist b/UITests/Info.plist index 78652acbd7..ec335779c8 100644 --- a/UITests/Info.plist +++ b/UITests/Info.plist @@ -17,7 +17,7 @@ CFBundleShortVersionString 1.1 CFBundleVersion - 354 + 355 PLTestingNetworkHMAC $(TESTING_NETWORK_HMAC) PLTestingNetworkKey