Merge tag 'v1.4.1' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 22 Apr 2015 18:15:51 +0000 (14:15 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 22 Apr 2015 18:15:51 +0000 (14:15 -0400)
commitf42c84eff72a0ac5a02d42ed667ca1fb90bfb788
treee4be6ae6a3664c0c1ea7ff4f56e9f57d58305143
parent9faa333d2db6e261d494d821d8edd76becc6d275
parent4a4bf2287691b21eba9e47fb233b2cd69857d388
Merge tag 'v1.4.1' into develop

v1.4.1

Conflicts:
Gaslightify.php