15 Commits

Author SHA1 Message Date
Edi
dcc1518c6f Merge origin/master
Conflicts:
	src/java/Logic.java
2019-08-06 11:45:25 +02:00
Edi
7fc93b901d Merge origin/master 2019-08-06 11:41:59 +02:00
Edi
c6f94deae3 Merge origin/master 2019-08-05 21:28:51 +02:00
Edi
b5188311b8 Merge origin/master 2019-08-05 21:26:57 +02:00
Edi
f416b0574a Merge origin/master 2019-07-23 08:27:24 +02:00
Edi
62830e92a6 Merge origin/master 2019-07-21 11:37:04 +02:00
Edi
80e9ec9dbc Merge origin/master 2019-07-18 17:05:35 +02:00
Edi
5996c744a2 Merge origin/master 2019-07-05 19:09:43 +02:00
Edi
d4db36c418 Merge origin/master 2019-06-26 00:25:04 +02:00
Edi
5b98bdfbf7 Merge origin/master 2019-06-25 14:36:35 +02:00
Edi
5fabb9780e Merge origin/master 2019-06-23 18:48:04 +02:00
Edi
54a5a77592 Test 2019-06-21 07:14:57 +02:00
Edi
d4889012a9 Test 2019-06-21 07:11:49 +02:00
Edi
6afd445265 Test 2019-06-21 06:43:29 +02:00
Edi
a2f9f3404f Test 2019-06-05 22:18:59 +02:00