]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
projects / thirdparty / foundation / foundation-sites.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Conflicts:
js/foundation.slider.js

1  2 
js/foundation.slider.js patch | diff1 | diff2 | blob | history

diff --cc js/foundation.slider.js
Simple merge
Mirror of https://github.com/foundation/foundation-sites.git