projects / WP-Plugins / glm-employment.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ddb2074 e648b60)
Merge branch 'develop' into feature/settingPage feature/settingPage
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 7 Dec 2015 19:00:51 +0000 (14:00 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 7 Dec 2015 19:00:51 +0000 (14:00 -0500)

Trivial merge