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)
commit8e7d689d0ac520bbe6240db662d5d30e8a901694
tree174984169d0e065e081604d105061df35cdbc601
parente7a8accc54d88e527371c8bf2eab3ab22328da66
parented0ab2e30aa62ba3ae1250cbd3e9b0b1cc695ab5
Merge tag 'V1.1.13' into develop

v1.1.13

Conflicts:
css/app.css