settings bullshit
Test123
Stundenplan der aktuellen KW
settings bullshit
Test123
Rebase to master.
Datenbanke Persistierung eingefügt.
Egal...
Rebase und Datenpank Persitierung
asdf
asdf
y
Merge branch 'b2010_EVB_GK_Export' of https://github.com/BlackWitwer/JESM3_SWE_Project.git into b2010_EVB_GK_Export
Name im Drawer - Test Border Noten
vergessen
Neuer Stundenplan #2
Selektive Vorlesungsabfragen.
Merge remote-tracking branch 'origin/b2010_EVB_GK_Export'

Conflicts:
	src/com/jesm3/newDualis/is/UserManager.java
	src/com/jesm3/newDualis/stupla/Vorlesung.java
Merge remote-tracking branch 'origin/b1710_SEW_IS'

Conflicts:
	src/com/jesm3/newDualis/is/UserManager.java
	src/com/jesm3/newDualis/stupla/VorlesungsplanManager.java