Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

BudgetMaster
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

1bf8833f

Commit 1bf8833f authored 4 years ago by jenkins

Downloads
- Plain Diff

Merge branch 'v_2_5_1'

parents a494f3c1 cc6d1614

Branches

Tags

No related merge requests found

Pipeline #4645 failed 4 years ago

Stage: external

Changes 7
Pipelines 1

Show whitespace changes

Inline Side-by-side

Showing

Dockerfile 1 addition, 1 deletion

Dockerfile
README.md 1 addition, 1 deletion

README.md
pom.xml 2 additions, 2 deletions

pom.xml
src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java 1 addition, 4 deletions

.../deadlocker8/budgetmaster/controller/AboutController.java
src/main/resources/languages/news_de.properties 2 additions, 11 deletions

src/main/resources/languages/news_de.properties
src/main/resources/languages/news_en.properties 2 additions, 11 deletions

src/main/resources/languages/news_en.properties
src/main/resources/static/js/transactions.js 7 additions, 3 deletions

src/main/resources/static/js/transactions.js

with 16 additions and 33 deletions

Loading

0% Loading 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