Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

s4s
- Activity
- Members

Snippets Groups Projects

1ee29ded

Commit 1ee29ded authored 7 years ago by hkarwa2s

Downloads
- Plain Diff

Merge branch 'master' of https://git.fslab.de/tpinza2s/s4s

# Conflicts:
#	src/main/java/org/s4s/gui/views/WarenkorbView.java

parents f4e93b8f 84cf66af

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

.idea/workspace.xml 110 additions, 81 deletions

.idea/workspace.xml
src/main/java/org/s4s/dao/RegistrationDAO.java 4 additions, 3 deletions

src/main/java/org/s4s/dao/RegistrationDAO.java
src/main/java/org/s4s/gui/InitView.java 1 addition, 0 deletions

src/main/java/org/s4s/gui/InitView.java
src/main/java/org/s4s/gui/views/TransaktionsBestaetigung.java 51 additions, 0 deletions

...main/java/org/s4s/gui/views/TransaktionsBestaetigung.java
src/main/java/org/s4s/gui/views/WarenkorbView.java 3 additions, 3 deletions

src/main/java/org/s4s/gui/views/WarenkorbView.java
src/main/java/org/s4s/services/util/Views.java 1 addition, 0 deletions

src/main/java/org/s4s/services/util/Views.java

with 170 additions and 87 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment