-
zikas96 authored
Conflicts: api/api-pastis/pastis-standalone/run.sh api/api-pastis/pastis/run.sh ui/ui-frontend/angular.json ui/ui-frontend/proxy.conf.json
e12483bb
Conflicts: api/api-pastis/pastis-standalone/run.sh api/api-pastis/pastis/run.sh ui/ui-frontend/angular.json ui/ui-frontend/proxy.conf.json