]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commit
projects / thirdparty / foundation / foundation-sites.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3ae9eaa b19360b)
Merge branch 'develop' of https://github.com/zurb/foundation-sites into rtl-slider 7684/head
authorMarius Olbertz <marius.olbertz@gmail.com>
Fri, 25 Dec 2015 13:26:59 +0000 (14:26 +0100)
committerMarius Olbertz <marius.olbertz@gmail.com>
Fri, 25 Dec 2015 13:26:59 +0000 (14:26 +0100)
commitbaef48905d776941cf101dd8ebe45314e8676a6b
tree9cad57df2dd9932f8ddd0e2838431793c2580690tree
parent3ae9eaa723990a2a2089a6ada77ed689aa4386e2commit | diff
parentb19360be6b44857bb1ec93f96478fc3086c0b642commit | diff
Merge branch 'develop' of https://github.com/zurb/foundation-sites into rtl-slider

Conflicts:
js/foundation.slider.js
js/foundation.slider.js diff1 | diff2 | blob | history
Mirror of https://github.com/foundation/foundation-sites.git