]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commit
Resolve merge conflict 9958/head
authorKevin Chu <kwhchu@users.noreply.github.com>
Mon, 10 Apr 2017 16:26:25 +0000 (09:26 -0700)
committerKevin Chu <kwhchu@users.noreply.github.com>
Mon, 10 Apr 2017 16:26:25 +0000 (09:26 -0700)
commitd808828d0954de1158a8422ea6ec69c6b2803768
tree7fd6780f0995987112013236bf81453e7b55bbcb
parentaac4f8388694147b8973e631d0f54b5bd8b45817
parent2594ecb63f1fd1c0f735981309d25bf6756069bb
Resolve merge conflict
docs/pages/index.md