[PR #976] [CLOSED] fix: conflicts #1293

New issue

Closed

opened 2026-02-26 19:32:39 +03:00 by kerem · 0 comments

kerem commented

2026-02-26 19:32:39 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/documenso/documenso/pull/976
Author: @SergeWilfried
Created: 2/29/2024
Status: ❌ Closed

Base: main ← Head: fixconflicts

📝 Commits (10+)

2474c92 Create sync.yml
0a6f79a Merge pull request #44 from documenso/main
47dd8d8 Merge branch 'main' of https://github.com/documenso/documenso
ec35015 Merge branch 'main' of https://github.com/documenso/documenso
2a277a5 Merge pull request #45 from documenso/main
b307bf4 Merge pull request #52 from documenso/main
e403875 Merge pull request #53 from documenso/main
8d784c9 Merge branch 'main' of https://github.com/documenso/documenso
5bc8853 Merge pull request #56 from documenso/main
793c5c5 Merge pull request #57 from documenso/main

📊 Changes

168 files changed (+8264 additions, -6134 deletions)

View changed files

📝 .devcontainer/devcontainer.json (+1 -1)
📝 .env.example (+1 -1)
📝 .github/workflows/codeql-analysis.yml (+1 -1)
📝 .github/workflows/issue-assignee-check.yml (+1 -1)
➕ .github/workflows/sync.yml (+39 -0)
📝 .vscode/settings.json (+5 -1)
📝 README.md (+1 -1)
📝 apps/marketing/next.config.js (+5 -1)
📝 apps/marketing/package.json (+1 -1)
📝 apps/marketing/public/android-chrome-192x192.png (+0 -0)
📝 apps/marketing/public/android-chrome-512x512.png (+0 -0)
📝 apps/marketing/public/apple-touch-icon.png (+0 -0)
📝 apps/marketing/public/blog/blog-author-duncan.jpeg (+0 -0)
📝 apps/marketing/public/blog/blog-author-lucas.png (+0 -0)
📝 apps/marketing/public/blog/blog-banner-manifest.jpeg (+0 -0)
📝 apps/marketing/public/blog/blog-banner-rewrite.png (+0 -0)
📝 apps/marketing/public/blog/burgers.jpeg (+0 -0)
📝 apps/marketing/public/blog/designsystem.png (+0 -0)
📝 apps/marketing/public/blog/early.png (+0 -0)
📝 apps/marketing/public/blog/gh1.png (+0 -0)

...and 80 more files

📄 Description

No description provided

_{🔄 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/documenso/documenso/pull/976 **Author:** [@SergeWilfried](https://github.com/SergeWilfried) **Created:** 2/29/2024 **Status:** ❌ Closed **Base:** `main` ← **Head:** `fixconflicts` --- ### 📝 Commits (10+) - [`2474c92`](https://github.com/documenso/documenso/commit/2474c927fd56bcd07353f45b01498098b8489f76) Create sync.yml - [`0a6f79a`](https://github.com/documenso/documenso/commit/0a6f79a9cdae8de8e8b70ae4d9e5ccda7cdb5d2e) Merge pull request #44 from documenso/main - [`47dd8d8`](https://github.com/documenso/documenso/commit/47dd8d8faefa97ad873af98b141b5904eccad127) Merge branch 'main' of https://github.com/documenso/documenso - [`ec35015`](https://github.com/documenso/documenso/commit/ec35015cc5a1e44c118d8343e884ab123d93e5c4) Merge branch 'main' of https://github.com/documenso/documenso - [`2a277a5`](https://github.com/documenso/documenso/commit/2a277a53af755c6f225c4963cd6eaccc51bb49a4) Merge pull request #45 from documenso/main - [`b307bf4`](https://github.com/documenso/documenso/commit/b307bf4077bc8459e1a73dc57c0f6f17f7aad126) Merge pull request #52 from documenso/main - [`e403875`](https://github.com/documenso/documenso/commit/e403875699d28a962fbef1a4f9fc52490551a5ba) Merge pull request #53 from documenso/main - [`8d784c9`](https://github.com/documenso/documenso/commit/8d784c92315c03437e4fe8a768b330889f1e6680) Merge branch 'main' of https://github.com/documenso/documenso - [`5bc8853`](https://github.com/documenso/documenso/commit/5bc8853a7e05bc500bb53203278f8dce03463145) Merge pull request #56 from documenso/main - [`793c5c5`](https://github.com/documenso/documenso/commit/793c5c5cfed9acea489a5f3935cc5eff0d434bdd) Merge pull request #57 from documenso/main ### 📊 Changes **168 files changed** (+8264 additions, -6134 deletions) <details> <summary>View changed files</summary> 📝 `.devcontainer/devcontainer.json` (+1 -1) 📝 `.env.example` (+1 -1) 📝 `.github/workflows/codeql-analysis.yml` (+1 -1) 📝 `.github/workflows/issue-assignee-check.yml` (+1 -1) ➕ `.github/workflows/sync.yml` (+39 -0) 📝 `.vscode/settings.json` (+5 -1) 📝 `README.md` (+1 -1) 📝 `apps/marketing/next.config.js` (+5 -1) 📝 `apps/marketing/package.json` (+1 -1) 📝 `apps/marketing/public/android-chrome-192x192.png` (+0 -0) 📝 `apps/marketing/public/android-chrome-512x512.png` (+0 -0) 📝 `apps/marketing/public/apple-touch-icon.png` (+0 -0) 📝 `apps/marketing/public/blog/blog-author-duncan.jpeg` (+0 -0) 📝 `apps/marketing/public/blog/blog-author-lucas.png` (+0 -0) 📝 `apps/marketing/public/blog/blog-banner-manifest.jpeg` (+0 -0) 📝 `apps/marketing/public/blog/blog-banner-rewrite.png` (+0 -0) 📝 `apps/marketing/public/blog/burgers.jpeg` (+0 -0) 📝 `apps/marketing/public/blog/designsystem.png` (+0 -0) 📝 `apps/marketing/public/blog/early.png` (+0 -0) 📝 `apps/marketing/public/blog/gh1.png` (+0 -0) _...and 80 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

kerem

2026-02-26 19:32:39 +03:00

closed this issue
added the
pull-request
label

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

starred/documenso#1293

No description provided.

Rows
Columns