projects / web / SooLocks.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4dabd5d 5086374)
Merge branch 'release/1.0.17' v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Fri, 5 May 2017 19:59:17 +0000 (15:59 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 5 May 2017 19:59:17 +0000 (15:59 -0400)

Trivial merge