Merge branch 'develop' (e67d93fc) · Commits · ERP (SIL) / BACK · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

B

BACK
- Activity
- Members
- Labels
- Issues
  4
- Issue boards
- Milestones
- Wiki
- Releases
- Package Registry
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

ERP (SIL)
BACK
Commits
e67d93fc

Commit e67d93fc authored 3 years ago by

GAYDAMAKHA MIKHAIL

Downloads
- Plain Diff

Merge branch 'develop'

parents 7f2e46d2 c74ae974

Branches

No related merge requests found

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/fr/unistra/sil/erp/back/WebMvcConfig.java 6 additions, 3 deletions

src/main/java/fr/unistra/sil/erp/back/WebMvcConfig.java
src/main/java/fr/unistra/sil/erp/back/controller/web/WebRegistryController.java 1 addition, 1 deletion

...ra/sil/erp/back/controller/web/WebRegistryController.java
src/main/resources/static/css/main.css 12 additions, 5 deletions

src/main/resources/static/css/main.css
src/main/resources/templates/fragments/head.html 2 additions, 2 deletions

src/main/resources/templates/fragments/head.html

with 21 additions and 11 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment