repositories / paefcais1617.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9cf2aa 605afff)
Merge branch 'master' of ygdrassil.git:paefcais1617
authorMart Lubbers <mart@martlubbers.net>
Thu, 8 Dec 2016 14:33:25 +0000 (15:33 +0100)
committerMart Lubbers <mart@martlubbers.net>
Thu, 8 Dec 2016 14:33:25 +0000 (15:33 +0100)

Trivial merge
1617-P2 - NWI-IMI003 Philosophy and Ethics for Computing and Information Science