projects / WP-Themes / jollylama.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f2555d fb4cc0f)
Merge branch 'release/1.1.0' v1.1.0
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 15:45:05 +0000 (11:45 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 15:45:05 +0000 (11:45 -0400)

Trivial merge