repositories / des2015.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8880a95 844ff9a)
Merge remote-tracking branch 'origin/master'
authorNatanael Adityasatria <nata.adit@gmail.com>
Thu, 7 Jan 2016 14:08:50 +0000 (15:08 +0100)
committerNatanael Adityasatria <nata.adit@gmail.com>
Thu, 7 Jan 2016 14:08:50 +0000 (15:08 +0100)
# Conflicts:
# dsl/runtime/specs/wander.tdsl


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.