Merge tag 'v1.0.11' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 Mar 2016 17:09:22 +0000 (12:09 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 Mar 2016 17:09:22 +0000 (12:09 -0500)
commit1736285bfeb18f70432996744f2f379122d1be99
tree7a34e4aab84cff01507c8ceca32e8268ff4646d4
parent64e4bec5cd05ab49008398835677bc92a6ab3e3e
parent1db5afc1da1d43b90bbfdfc9cf91fe79f4f3e067
Merge tag 'v1.0.11' into develop

v1.0.11

Conflicts:
css/app.css
css/app.css