Fix/timeout (!111) · Merge requests · Gruppe 12 / Picturerama · GitLab

Snippets Groups Projects

Closed Hermann Owren Elton requested to merge fix/timeout into dev 4 years ago

Apr 16, 2020
- Merge branch 'dev' into fix/timeout · 5ac2b22b
  Hermann Elton authored 4 years ago
```
# Conflicts:
#	src/main/App/Database/Hibernate.java
#	src/main/resources/META-INF/persistence.xml
```
  5ac2b22b
- Merge branch 'dev' into fix/timeout · c90be332
  Hermann Elton authored 4 years ago
  
  c90be332
Apr 12, 2020
- removed useless code · 5c928519
  Hermann Elton authored 4 years ago
  
  5c928519
- fix timeout · 28e72c39
  Hermann Elton authored 4 years ago
  
  28e72c39