Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge from master #153

Merged
merged 16 commits into from
Feb 21, 2025
Merged

Merge from master #153

merged 16 commits into from
Feb 21, 2025

Conversation

skinkie
Copy link
Contributor

@skinkie skinkie commented Feb 21, 2025

No description provided.

haeckerbaer and others added 16 commits October 25, 2022 13:33
@haeckerbaer
fix critical bugfix and correct tags
a4231a2
@haeckerbaer
bugfixes in examples to ensure validity
0619478
@haeckerbaer
fix critical bug (missing tags)
de702a4
@haeckerbaer
bugfixes in examples to ensure validity
1f6b312
@haeckerbaer
Merge branch 'master' of https://github.com/SIRI-CEN/SIRI
b9786f1
@haeckerbaer
Merge branch 'integration' (v2.1)
87fe020
@sgrossberndt
Global import of all IFOPT/ACSB namespace elements
1216c8b 
This is needed to work around JAXB/XERCES/xmllint limitations
@skinkie
Merge pull request #108 from SIRI-CEN/fixing-imports
aca7fa7 
fixing imports
@ue71603
typos
cc77053
@ue71603
Revert "typos"
ce377ce 
This reverts commit cc77053.
@skinkie
Travil to github actios
15c3efe
@github-actions
Lint and update documentation tables
d1e4589
@skinkie
Merge pull request #151 from SIRI-CEN/travis_to_actions
56bdc12 
Travis to github actions
@skinkie
Ignore local .git folder
30bee81
@skinkie
Merge pull request #152 from SIRI-CEN/fix_github_aciton
b71b8d2 
Ignore local .git folder
@skinkie
Merge branch 'master' into merge_from_master
0c008ac
@skinkie skinkie self-assigned this Feb 21, 2025
@skinkie skinkie merged commit 048b207 into integration Feb 21, 2025
1 check passed
@skinkie skinkie deleted the merge_from_master branch February 21, 2025 10:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Aurige Aurige Aurige approved these changes

@haeckerbaer haeckerbaer haeckerbaer approved these changes

@TuThoThai TuThoThai TuThoThai approved these changes

Assignees

@skinkie skinkie

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@skinkie @Aurige @haeckerbaer @TuThoThai @sgrossberndt @ue71603