Merge branch 'master' into feature/request-historic (b3d5398c) · Commits · EOSC-Pillar / FFDS / ffds-smart-harvester · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

ffds-smart-harvester
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

b3d5398c

Commit b3d5398c authored 3 years ago by Charly Maeder

Downloads
- Plain Diff

Merge branch 'master' into feature/request-historic

parents 668ac1fc 1319f7d2

No related branches found

No related tags found

1 merge request!7Feature/request historic

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/com/smartharvester/controller/SmartHarvesterCatalogController.java 59 additions, 0 deletions

...harvester/controller/SmartHarvesterCatalogController.java
src/main/java/com/smartharvester/dao/CatalogDaoRepository.java 5 additions, 1 deletion

...ain/java/com/smartharvester/dao/CatalogDaoRepository.java
src/main/java/com/smartharvester/model/user/SmartHarvesterUser.java 1 addition, 1 deletion

...ava/com/smartharvester/model/user/SmartHarvesterUser.java

with 65 additions and 2 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