[PR #475] [MERGED] repull of #450. #1632

New issue

Closed

opened 2026-03-03 19:08:05 +03:00 by kerem · 0 comments

kerem commented

2026-03-03 19:08:05 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/PlayCover/PlayCover/pull/475
Author: @Amachik
Created: 11/1/2022
Status: ✅ Merged
Merged: 11/1/2022
Merged by: @Depal1

Base: develop ← Head: develop

📝 Commits (10+)

b73b19f tiktok blacklisting
f219c90 fix
e3cde56 Update project.pbxproj
0a4a71b Update Cartfile.resolved
cffb2cc Update PlayApp.swift
e59b7a8 Update PlayApp.swift
8556bbe Merge branch 'develop' of https://github.com/Amachik/PlayCover into develop
367b064 rewrite of my original pr. for titktok blacklisting
94cbc0e polishing
c29779c Update PlayApp.swift

📊 Changes

4 files changed (+16 additions, -4 deletions)

View changed files

📝 PlayCover/Model/PlayApp.swift (+12 -3)
📝 PlayCover/PlayCoverError.swift (+3 -0)
📝 PlayCover/Views/App Views/StoreAppView.swift (+0 -1)
📝 PlayCover/en.lproj/Localizable.strings (+1 -0)

📄 Description

problem with merging via desynced files.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/PlayCover/PlayCover/pull/475 **Author:** [@Amachik](https://github.com/Amachik) **Created:** 11/1/2022 **Status:** ✅ Merged **Merged:** 11/1/2022 **Merged by:** [@Depal1](https://github.com/Depal1) **Base:** `develop` ← **Head:** `develop` --- ### 📝 Commits (10+) - [`b73b19f`](https://github.com/PlayCover/PlayCover/commit/b73b19f55d4d0644abcee6add32b5cdbe0ad5551) tiktok blacklisting - [`f219c90`](https://github.com/PlayCover/PlayCover/commit/f219c90236376b6951f4e8520e3e67dd4e1b245c) fix - [`e3cde56`](https://github.com/PlayCover/PlayCover/commit/e3cde5693bfc40c3ae7253f475f7893b782269e8) Update project.pbxproj - [`0a4a71b`](https://github.com/PlayCover/PlayCover/commit/0a4a71b5b214d9f530b1b64771423e0ca5000f36) Update Cartfile.resolved - [`cffb2cc`](https://github.com/PlayCover/PlayCover/commit/cffb2ccca31cdcf1c0cd1a478a9851744563bccb) Update PlayApp.swift - [`e59b7a8`](https://github.com/PlayCover/PlayCover/commit/e59b7a84717c006c2a7c19bccebef5613c5a3651) Update PlayApp.swift - [`8556bbe`](https://github.com/PlayCover/PlayCover/commit/8556bbeccf743acd047e3c0c005a2c9442e1a0a2) Merge branch 'develop' of https://github.com/Amachik/PlayCover into develop - [`367b064`](https://github.com/PlayCover/PlayCover/commit/367b0642ea5dc20b75b8b5b9fb8b0f13906d6d0d) rewrite of my original pr. for titktok blacklisting - [`94cbc0e`](https://github.com/PlayCover/PlayCover/commit/94cbc0e72843c50d6e323eeba6753747d7de2e4b) polishing - [`c29779c`](https://github.com/PlayCover/PlayCover/commit/c29779c73f5ff5e7a103a7b1d06811e89a156343) Update PlayApp.swift ### 📊 Changes **4 files changed** (+16 additions, -4 deletions) <details> <summary>View changed files</summary> 📝 `PlayCover/Model/PlayApp.swift` (+12 -3) 📝 `PlayCover/PlayCoverError.swift` (+3 -0) 📝 `PlayCover/Views/App Views/StoreAppView.swift` (+0 -1) 📝 `PlayCover/en.lproj/Localizable.strings` (+1 -0) </details> ### 📄 Description problem with merging via desynced files. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>