Browse Source
Merge branch 'master' of https://intra.acdp.at/gogs/bscheibel/ui
# Conflicts: # app/templates/index.html # app/views.py
bscheibel
3 changed files with 1 additions and 2 deletions
+ 1
- 1
.gitignore
|
||
|
||
|
||
BIN
app/temporary/GV_12.PDF
+ 0
- 1
gitignore
|
||
|
||