]> 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: 602ffd0 f888f1b)
Merge branch 'upstream/develop' into develop
authorsethk <sethk@criticalmass.com>
Wed, 13 Jul 2016 19:18:57 +0000 (12:18 -0700)
committersethk <sethk@criticalmass.com>
Wed, 13 Jul 2016 19:18:57 +0000 (12:18 -0700)
* upstream/develop:
  Add check if key exists in map
  Fix ghetto for loop
  Enable the script to load in DoneJS SSR
  [JS-dropdown] no-reggression unit test for getPosition()
  Fix bad nesting that breaks input-number-spinners styles


Trivial merge
Mirror of https://github.com/foundation/foundation-sites.git