projects / web / SooLocks.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 573678d 216c9d7)
Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 20:33:32 +0000 (16:33 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 20:33:32 +0000 (16:33 -0400)

Trivial merge