Merge tag 'v1.4.8' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 11 Oct 2016 19:39:20 +0000 (15:39 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 11 Oct 2016 19:39:20 +0000 (15:39 -0400)
commit498ade0fd5fe65b43d4bdb8f312fb53f8f2d4d43
tree2f1145b889fe1912329e110fa5a730079d73b835
parent4cf48585378d64a126998b3a01292481c5a59b48
parentedaa520212af24dcf0161df3c31bfa6010da667f
Merge tag 'v1.4.8' into develop

bumping version number, moving the placement of the agenda view to and from dates for the 'occurring' string so that the dates will actually display