conflict/main #19

Merged

Volk merged 19 commits from conflict/main into main 2026-02-13 14:15:35 +01:00

Conversation 0 Commits 19 Files changed 2 +10 -10

Volk commented 2026-02-13 14:15:24 +01:00

Owner

Copy link

No description provided.

Volk added 19 commits 2026-02-13 14:15:25 +01:00

Added epoch.src ... 869c00e172

Added .gitattributes

Merge pull request 'Added epoch.src' (#1) from feature/epoch into dev ... 3600777235

Reviewed-on: Viper/GSSE#1

Added environment settings 2d502351b1

Added gsse.src for easy import fa0502d5e1

Added main file for easy compiling 88c5a1eee0

restored from other repo d8fe7bce2e

Merge pull request 'feature/build-files' (#3) from feature/build-files into dev ... 3d41a7a43a

Reviewed-on: Viper/GSSE#3

added tests for all functions a8005ea581

added new bundle dabe3a2bf1

fixed base64 null byte bug fce26cf1f6

Merge pull request 'fixed base64 and power bugs' (#4) from bugfix/crypto into dev ... e66a350ae3

Reviewed-on: #4

Merge pull request 'feature/tests' (#6) from feature/tests into dev ... 679c278ca3

Reviewed-on: #6

This will fix merge conflicts in the future 006a2ee937

Merge pull request 'This will fix merge conflicts in the future' (#10) from refactor/no-builds into dev ... df3f9551ec

Reviewed-on: #10

Update: greytests update 3250002365

Merge pull request 'Update: greytests update' (#13) from update/greytests into dev ... 28915d49aa

Reviewed-on: #13

Capitals are used for global classes ebf533838e

Merge pull request 'Capitals are used for global classes' (#14) from update/epoch-capital into dev ... 71d35a76de

Reviewed-on: #14

conflict fix a00f3f6298

Volk merged commit 0ceb50fefd into main 2026-02-13 14:15:35 +01:00

Volk deleted branch conflict/main 2026-02-13 14:15:35 +01:00

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

conflict/main (#19)

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!19

No description provided.