Merge tag 'V1.1.13' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 16:34:19 +0000 (11:34 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 16:34:19 +0000 (11:34 -0500)
v1.1.13

Conflicts:
css/app.css


Trivial merge