projects / web / SooLocks.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1dc6bf6 5525506)
Merge tag 'v1.0.9' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 20:15:55 +0000 (16:15 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 20:15:55 +0000 (16:15 -0400)
v1.0.9

Conflicts:
templates/template.html


Trivial merge