Skip to content

Commit

Permalink
Merge branch 'develop' into feature/communication/forward-share-message
Browse files Browse the repository at this point in the history
  • Loading branch information
krusche authored Jan 5, 2025
2 parents af6ba8a + 294adf7 commit d011d73
Show file tree
Hide file tree
Showing 586 changed files with 4,899 additions and 19,824 deletions.
1 change: 0 additions & 1 deletion .github/issue-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ programming:
- build plan
- code hint
- \b(?<!\S)git(?!\S)\b
- testwise coverage
- \b(?<!\S)ide(?!\S)\b
- submission policy
- aeolus
Expand Down
11 changes: 5 additions & 6 deletions .idea/runConfigurations/Artemis__Server__LocalVC___LocalCI_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2024 TUM Applied Education Technologies
Copyright (c) 2025 TUM Applied Education Technologies

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ Refer to [Using JHipster in production](http://www.jhipster.tech/production) for
The following command can automate the deployment to a server. The example shows the deployment to the main Artemis test server (which runs a virtual machine):

```shell
./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.8.1.war
./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.8.2.war
```

## Architecture
Expand Down
2 changes: 1 addition & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
"packageManager": "npm",
"cache": {
"enabled": true,
"path": ".cache",
"path": "./build/angular/",
"environment": "all"
},
"schematicCollections": [
Expand Down
Loading

0 comments on commit d011d73

Please sign in to comment.