Skip to content
Snippets Groups Projects
Commit 0ba42a40 authored by Nico Vermaas's avatar Nico Vermaas
Browse files

Merge branch 'dev-nico' into 'master'

create nico-dev branch and change CI/CD pipelines

See merge request astron-sdc/esap-gui!9
parents 52e74baa 5388a7a0
No related branches found
No related tags found
2 merge requests!17Master,!9create nico-dev branch and change CI/CD pipelines
Pipeline #12448 passed
...@@ -38,6 +38,7 @@ deploy-esap-gui: ...@@ -38,6 +38,7 @@ deploy-esap-gui:
when: manual when: manual
only: only:
- esap-gui-dev - esap-gui-dev
- dev-nico
- master - master
deploy-esap-gui-acceptance: deploy-esap-gui-acceptance:
......
src/assets/esap_logo.png

6.12 KiB | W: | H:

src/assets/esap_logo.png

22.2 KiB | W: | H:

src/assets/esap_logo.png
src/assets/esap_logo.png
src/assets/esap_logo.png
src/assets/esap_logo.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/esap_logo_old.png

6.12 KiB

...@@ -51,7 +51,7 @@ export default function Routes() { ...@@ -51,7 +51,7 @@ export default function Routes() {
</Route> </Route>
<Route exact path="/samp" component={SampPage} /> <Route exact path="/samp" component={SampPage} />
</Switch> </Switch>
<footer><small>esap-gui version 23 march 2021 14:00</small></footer> <footer><small>esap-gui version 30 april 2021 11:00</small></footer>
</Router> </Router>
); );
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment