projects / web/konrad/smoke.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: feb428a 32bfb9c)
Merge branch 'seating' into master
authorKonrad Rosenbaum <konrad@silmor.de>
Sat, 21 Nov 2015 13:48:37 +0000 (14:48 +0100)
committerKonrad Rosenbaum <konrad@silmor.de>
Sat, 21 Nov 2015 13:48:37 +0000 (14:48 +0100)

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