]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commit
projects / thirdparty / foundation / foundation-sites.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 397084a) | patch
fix: resolve invalid conflict resolution #11077 for v6.5 11356/head
authorDaniel Ruf <daniel.ruf@ueberbit.de>
Wed, 27 Jun 2018 11:11:51 +0000 (13:11 +0200)
committerDaniel Ruf <daniel@daniel-ruf.de>
Wed, 27 Jun 2018 18:34:18 +0000 (20:34 +0200)
commit77d43b82c962504ec5c2c971f623b22d5b1b4f9a
tree63bd67e8c12b941867a308a25caa259857ea0bbetree
parent397084ac464d7cae733b507dda4a7c1526a38f79commit | diff
fix: resolve invalid conflict resolution #11077 for v6.5
js/foundation.magellan.js diff | blob | blame | history
Mirror of https://github.com/foundation/foundation-sites.git