projects / web / SooLocks.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8d986a0 59826b4)
Merge branch 'feature/template' into develop
authorOve Klykken <klykken@gmail.com>
Tue, 10 Jun 2014 18:26:45 +0000 (14:26 -0400)
committerOve Klykken <klykken@gmail.com>
Tue, 10 Jun 2014 18:26:45 +0000 (14:26 -0400)

Trivial merge