Resolving merge conflict with Laury's changes
authorIan Weller <ian@gaslightmedia.com>
Thu, 7 Apr 2016 14:27:46 +0000 (10:27 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 7 Apr 2016 14:27:46 +0000 (10:27 -0400)
commit348f0cce74e92db4263c069504fd1f3eedc842ab
tree57bfa08267dbea5be92e7c5b665177bc7e64ff57
parent1b5eef6a2f9ed25c4b069852318f15213993db4f
parent8214c81f4b8af979940ff5b0ef18d430a94b58fb
Resolving merge conflict with Laury's changes
css/app.css
css/app.css.map
front-page.php