Merge branch 'develop' into hotfix/leaflet-config

rl-institut · Jul 8, 2019 · ec70a24 · ec70a24
2 parents 530302a + 8acc78e
commit ec70a24
Show file tree

Hide file tree

Showing 8 changed files with 758 additions and 11 deletions.
diff --git a/static/WAM_APP_FRED/img/bmwi.svg b/static/WAM_APP_FRED/img/bmwi.svg
diff --git a/static/WAM_APP_FRED/img/open_fred.svg b/static/WAM_APP_FRED/img/open_fred.svg
diff --git a/static/WAM_APP_FRED/img/ovgu.svg b/static/WAM_APP_FRED/img/ovgu.svg
diff --git a/static/WAM_APP_FRED/img/rli.svg b/static/WAM_APP_FRED/img/rli.svg
diff --git a/static/WAM_APP_FRED/img/tab_icons/feedin.svg b/static/WAM_APP_FRED/img/tab_icons/feedin.svg
diff --git a/static/WAM_APP_FRED/img/tab_icons/powerplants.svg b/static/WAM_APP_FRED/img/tab_icons/powerplants.svg