repositories / fp1415.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1565c7c 406b3a2)
Merge branch 'master' of github:dopefishh/fp1415
authorCamil Staps <info@camilstaps.nl>
Thu, 28 May 2015 20:01:57 +0000 (22:01 +0200)
committerCamil Staps <info@camilstaps.nl>
Thu, 28 May 2015 20:01:57 +0000 (22:01 +0200)

Trivial merge
1415-S1 - Functioneel programmeren 1 en 2