]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commit
Fix conflicts
authorKevin Chu <kwhchu@users.noreply.github.com>
Mon, 8 May 2017 16:40:31 +0000 (09:40 -0700)
committerKevin Chu <kwhchu@users.noreply.github.com>
Mon, 8 May 2017 16:40:31 +0000 (09:40 -0700)
commit9a0c04f57e3e308481b4426b000ab55d588bec56
tree7e0226edbf4e026769edbb175b7cf98765a3b34e
parent7cacd5fbded8d7d1b109ae712c16c227a9eaf51c
Fix conflicts
docs/assets/scss/docs.scss
docs/layout/default.html