]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commit
fix merge conflict 9242/head
authorAndy Hebrank <ahebrank@gmail.com>
Fri, 4 Nov 2016 12:05:28 +0000 (08:05 -0400)
committerAndy Hebrank <ahebrank@gmail.com>
Fri, 4 Nov 2016 12:05:28 +0000 (08:05 -0400)
commit60045b14771cc0d9f32427ddbd7f7a73ec65624f
tree1d8d37d2f51529b5c86e42d74470bca9fa216039
parent913cff7cd4488cee6e4c3600f4f5e64d6a0fe792
parent91c6a927f8e43440400ccfbd0c7a12f2577e892c
fix merge conflict
js/foundation.tabs.js