Develop #8

Merged
SemvdH merged 10 commits from develop into master 2020-09-18 15:16:53 +00:00

10 Commits

Author SHA1 Message Date
Sem van der Hoeven
c63b51c22b fix? 2020-09-18 17:15:10 +02:00
Sem van der Hoeven
1ce519f661 wat 2020-09-18 17:14:16 +02:00
Sem van der Hoeven
7df8d98ed9 test 2020-09-18 17:08:19 +02:00
Sem van der Hoeven
fce99ff9ec Merge branch 'master' into develop 2020-09-18 17:00:17 +02:00
Sem van der Hoeven
a4bfac3de1 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-09-18 16:58:50 +02:00
SemvdH
5762989f93 Merge pull request #5 from SemvdH/temp
test
2020-09-18 16:58:41 +02:00
Sem van der Hoeven
fe977deb46 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-09-18 16:57:25 +02:00
Sem van der Hoeven
541538d50a test 2020-09-18 16:56:37 +02:00
shinichi
8f8490fe2a Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 16:54:23 +02:00
shinichi
47cfe4efe6 nope 2020-09-18 16:54:21 +02:00