Merge branch 'master' of https://github.com/zurb/foundation

author Preston <prestonmcp@yahoo.com>

Wed, 16 Jul 2014 00:15:14 +0000 (17:15 -0700)

committer Preston <prestonmcp@yahoo.com>

Wed, 16 Jul 2014 00:15:14 +0000 (17:15 -0700)
author Preston <prestonmcp@yahoo.com>
Wed, 16 Jul 2014 00:15:14 +0000 (17:15 -0700)
committer Preston <prestonmcp@yahoo.com>
Wed, 16 Jul 2014 00:15:14 +0000 (17:15 -0700)
diff --cc doc/pages/components/topbar.html

index 377d6e4b89a71ba323b16df2d0caadaa65da5c4e,751a0455ad9d5a2d2f19dcbd51427ea004eab93a..751a0455ad9d5a2d2f19dcbd51427ea004eab93a

mode 100755,100644..100755
--- 1/doc/pages/components/topbar.html
--- 2/doc/pages/components/topbar.html
+++ b/doc/pages/components/topbar.html
diff --cc js/foundation/foundation.joyride.js

index 1117c18249527b0c6c2bdb92041a0d21a72d3865,b147938efb545739d545162f5ad06d2ea2bb4272..b147938efb545739d545162f5ad06d2ea2bb4272

mode 100755,100644..100755
--- 1/js/foundation/foundation.joyride.js
--- 2/js/foundation/foundation.joyride.js
+++ b/js/foundation/foundation.joyride.js
diff --cc js/foundation/foundation.reveal.js

index 3b8d19e341ce4ee6a43d3859616cf5431669077b,890ad8a0666130e3c35b3919ca68a9f6c77981d5..890ad8a0666130e3c35b3919ca68a9f6c77981d5

mode 100755,100644..100755
--- 1/js/foundation/foundation.reveal.js
--- 2/js/foundation/foundation.reveal.js
+++ b/js/foundation/foundation.reveal.js
author	Preston <prestonmcp@yahoo.com>
	Wed, 16 Jul 2014 00:15:14 +0000 (17:15 -0700)
committer	Preston <prestonmcp@yahoo.com>
	Wed, 16 Jul 2014 00:15:14 +0000 (17:15 -0700)
		1	2
doc/pages/components/topbar.html	patch \|	diff1 \|	diff2 \|	blob \| history
js/foundation/foundation.joyride.js	patch \|	diff1 \|	diff2 \|	blob \| history
js/foundation/foundation.reveal.js	patch \|	diff1 \|	diff2 \|	blob \| history