Merge tag 'v1.0.5' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 13 Nov 2017 16:54:15 +0000 (11:54 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 13 Nov 2017 16:54:15 +0000 (11:54 -0500)
commit409af9a63c5a5bf43e60b0d61c386863f9bef3f0
treed4c4ae3ac8fd21dbdd1902dcdadfa78c16720907
parent5c05ed26d05836c5349d8cf2f861db0d37ba09d9
parent796c79e3ded99eacb217e3ef73117ee07bd5b06a
Merge tag 'v1.0.5' into develop

removing forced template functions from the functions file