naschi eb55bb316e Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	Formeln.py

2019-07-23 09:39:42 +02:00

..

Jonne.py

Merge branch 'master' of C:\Users\heimannjo\PycharmProjects\projekttage with conflicts.

2019-07-23 11:29:52 +02:00

naschikathy.py

moin

2019-07-23 09:33:49 +02:00