Skip to content

Commit

Permalink
Merge branch 'master' of github.com:zurb/foundation
Browse files Browse the repository at this point in the history
  • Loading branch information
zurbchris committed Mar 2, 2013
2 parents f5623c6 + 5ea5cd9 commit 5366aa9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
zurb-foundation (4.0.2)
zurb-foundation (4.0.3)
rake
sass (>= 3.2.0)

Expand Down
2 changes: 1 addition & 1 deletion js/foundation/foundation.section.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
init : function (scope, method, options) {
this.scope = scope || this.scope;
Foundation.inherit(this, 'throttle data_options');
console.log(this)

if (typeof method === 'object') {
$.extend(true, this.settings, method);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/foundation/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Foundation
VERSION = "4.0.2"
VERSION = "4.0.3"
end

0 comments on commit 5366aa9

Please sign in to comment.