| commit | 6c5a4ab79d88405b5cc8929800d71b5f9d646ca7 | [log] [tgz] |
|---|---|---|
| author | Ina Curdt <simon.reis@pta.de> | Wed Sep 19 14:03:10 2018 +0200 |
| committer | Ina Curdt <simon.reis@pta.de> | Wed Sep 19 14:03:10 2018 +0200 |
| tree | 0955d203a6b5f2b9da881b690dec72aaccaa387c | |
| parent | b66086e3ddebb094ab1d83ab9f60d0f3a33e975f [diff] | |
| parent | abfb0f71a4abe0d1b5b7526ac07739ef9148305c [diff] |
Merge branch 'DEVELOP_BE' of ssh://172.18.22.160:29418/oK/PlannedGridMeasures/mics-backend into DEVELOP_BE # Conflicts: # devlocal.yml # qserver.yml