Commit Graph

15 Commits

Author SHA1 Message Date
stockth 71c8f38825 t 2019-07-23 10:39:31 +02:00
stockth 95d3349bcc Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Formeln.py
2019-07-23 10:37:05 +02:00
stockth 26169e453d t 2019-07-23 10:36:25 +02:00
stockth 0a2a1e533d t 2019-07-23 09:56:58 +02:00
lars 779ea729a7 merged 2019-07-23 10:48:36 +02:00
stockth bf8aae9545 t 2019-07-23 09:40:55 +02:00
lars 4929b19636 Formeln#1 2019-07-23 10:43:29 +02:00
naschi eb55bb316e Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Formeln.py
2019-07-23 09:39:42 +02:00
komminshotel 46d3015022 jonnehei 2019-07-23 11:33:13 +02:00
komminshotel 398a2d8424 jonnehei 2019-07-23 11:31:32 +02:00
michelar d7dc82b37f ruweigfiwgfihuidfsp98uf 2019-07-23 10:28:47 +02:00
michelar 1d28ae0b5f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Formeln.py
2019-07-23 10:27:56 +02:00
michelar 011338461d ruweigfiwgfihuidfsp98uf 2019-07-23 10:26:34 +02:00
dxnso 314465d931 Hallo 2019-07-23 10:22:12 +02:00
naschi b054aba5f5 moin 2019-07-23 09:33:49 +02:00