3 Commits

Author	SHA1	Message	Date
naschi	eb55bb316e	Merge remote-tracking branch 'origin/master' ... # Conflicts: # Formeln.py	2019-07-23 09:39:42 +02:00
komminshotel	5b607d44bb	Merge branch 'master' of C:\Users\heimannjo\PycharmProjects\projekttage with conflicts.	2019-07-23 11:29:52 +02:00
naschi	b054aba5f5	moin	2019-07-23 09:33:49 +02:00