Feat/loading animation (!47) · Merge requests · Gruppe 12 / Picturerama · GitLab

Snippets Groups Projects

Merged Diderik Kramer requested to merge feat/loadingAnimation into dev 4 years ago

Mar 19, 2020
- Merge branch 'dev' into feat/loadingAnimation · bfc595b9
  Diderik Kramer authored 4 years ago
  
  bfc595b9
- Merge branch 'dev' into fix/signupScene · ad389608
  Diderik Kramer authored 4 years ago
  
  ad389608
- Merge branch 'dev' into feat/loadingAnimation · 911fe5a4
  Diderik Kramer authored 4 years ago
  
  911fe5a4
- Merge branch 'dev' into loadingAnimation · 1ca89db3
  Diderik Kramer authored 4 years ago
```
# Conflicts:
#	src/main/App/Scenes/LogIn.java
```
  1ca89db3
- Merge branch 'dev' into fix/signupScene · 0a657925
  Diderik Kramer authored 4 years ago
  
  0a657925