conflict #22

Merged

Volk merged 7 commits from conflict into dev 2026-02-13 14:22:44 +01:00

Conversation 0 Commits 7 Files changed 1 +1 -1

Volk commented 2026-02-13 14:22:38 +01:00

Owner

Copy link

No description provided.

Volk added 7 commits 2026-02-13 14:22:38 +01:00

dev (#2) ... 6d349710c4

Added epoch.src
Added .gitattributes

Reviewed-on: Viper/GSSE#2

bugfix/crypto (#5) ... 67543e6864

Reviewed-on: #5

dev (#11) ... 1b6e140211

Reviewed-on: #11

bugfix: build artificats were still present 51ed0a6439

Merge pull request 'bugfix: build artificats were still present' (#12) from bugfix/main-build-artifacts into main ... 1066937bd8

Reviewed-on: #12

conflict/main (#19) ... 0ceb50fefd

Reviewed-on: #19

conflict fix 8ea7c2707d

Volk merged commit 77a3ed4dc7 into dev 2026-02-13 14:22:44 +01:00

Volk deleted branch conflict 2026-02-13 14:22:44 +01:00

Volk referenced this pull request from a commit 2026-02-13 14:22:45 +01:00

Merge pull request 'conflict' (#22) from conflict into dev

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

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

Viper/gsse!22

No description provided.