SomeNet / public repos / pub / jan / aic18.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef13242 4c818aa)
Merge remote-tracking branch 'origin/master' into service-twitter
authorMichael Winsauer <e1429715@student.tuwien.ac.at>
Sat, 3 Nov 2018 16:58:29 +0000 (17:58 +0100)
committerMichael Winsauer <e1429715@student.tuwien.ac.at>
Sat, 3 Nov 2018 16:58:29 +0000 (17:58 +0100)

Trivial merge