]> git.uio.no Git - ifi-stolz-refaktor.git/commitdiff
git://git.uio.no / ifi-stolz-refaktor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0486d88 38fdf34)
Merge branch 'master' of https://bitbucket.org/sowhow/masterrefactorproject
authorAnna <anna@158-37-206-32.hib.no>
Wed, 28 Sep 2016 12:42:19 +0000 (14:42 +0200)
committerAnna <anna@158-37-206-32.hib.no>
Wed, 28 Sep 2016 12:42:19 +0000 (14:42 +0200)

Trivial merge
Refaktor masterproject