Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 18:20:00 +0000 (13:20 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 18:20:00 +0000 (13:20 -0500)
commit0296178578e43388fadd7198266dd14038227e9c
tree5cdc4c1170f1874edb313503032ba93621510392
parentce8ef378989c7a3ec17658a37139785bb553a4ee
parent6d64bbc1f45f294c469a5a471774baad2636d12b
Merge branch 'hotfix/1.0.2'

Conflicts:
css/app.css
css/app.css
functions.php