There was an error fetching the commit references. Please try again later.
Merge remote-tracking branch 'origin/master'
# Conflicts: # .idea/compiler.xml # .idea/dataSources.xml
Showing
- .idea/compiler.xml 0 additions, 1 deletion.idea/compiler.xml
- .idea/dataSources.xml 1 addition, 1 deletion.idea/dataSources.xml
- .idea/ip1_gruppe8.iml 12 additions, 0 deletions.idea/ip1_gruppe8.iml
- .idea/modules.xml 8 additions, 0 deletions.idea/modules.xml
- .idea/sqldialects.xml 7 additions, 0 deletions.idea/sqldialects.xml
- .idea/vcs.xml 3 additions, 1 deletion.idea/vcs.xml
- datenbank_horizon_changers.sql 214 additions, 0 deletionsdatenbank_horizon_changers.sql
- userman_all/client/assets/Bild.jpg 0 additions, 0 deletionsuserman_all/client/assets/Bild.jpg
- userman_all/client/assets/HORIZON CHANGERS.PNG 0 additions, 0 deletionsuserman_all/client/assets/HORIZON CHANGERS.PNG
- userman_all/client/assets/MAPLÄNDER.png 0 additions, 0 deletionsuserman_all/client/assets/MAPLÄNDER.png
- userman_all/client/assets/angetreteneReisen.jpg 0 additions, 0 deletionsuserman_all/client/assets/angetreteneReisen.jpg
- userman_all/client/assets/bevorstehendeReisen.jpg 0 additions, 0 deletionsuserman_all/client/assets/bevorstehendeReisen.jpg
- userman_all/client/assets/helles logo.png 0 additions, 0 deletionsuserman_all/client/assets/helles logo.png
- userman_all/client/assets/heroimage.jpg 0 additions, 0 deletionsuserman_all/client/assets/heroimage.jpg
- userman_all/client/assets/keniaprojekt.jpeg 0 additions, 0 deletionsuserman_all/client/assets/keniaprojekt.jpeg
- userman_all/client/assets/peruprojekt (1).jpeg 0 additions, 0 deletionsuserman_all/client/assets/peruprojekt (1).jpeg
- userman_all/client/assets/spanienprojket 2.jpg 0 additions, 0 deletionsuserman_all/client/assets/spanienprojket 2.jpg
- userman_all/client/index.html 446 additions, 98 deletionsuserman_all/client/index.html
- userman_all/client/package-lock.json 184 additions, 1 deletionuserman_all/client/package-lock.json
- userman_all/client/package.json 4 additions, 1 deletionuserman_all/client/package.json
Please register or sign in to comment