Skip to content
Snippets Groups Projects
Commit eea88ec8 authored by kbeyro's avatar kbeyro
Browse files

Merge branch 'develop' into...

Merge branch 'develop' into 177-allow-for-refreshing-status-information-for-a-single-or-all-application-instances-in-a-bulk

# Conflicts:
#	src/main/java/net/geant/nmaas/portal/api/bulk/BulkController.java
#	src/main/java/net/geant/nmaas/portal/service/impl/BulkApplicationServiceImpl.java
parents 0cda3fc8 b560556e
No related branches found
No related tags found
3 merge requests!65Resolve "Prevent users from adding an existing SSH key",!601.6.5 fix processing bulk,!25Resolve "Allow for refreshing status information for a single or all application instances in a bulk"
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment