Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/develop' into develop
Browse files Browse the repository at this point in the history
Conflicts:
	dist/ngHandsontable.js
	dist/ngHandsontable.min.js
  • Loading branch information
kubak10 committed Apr 8, 2015
2 parents ee24664 + add260e commit ff8dc66
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit ff8dc66

Please sign in to comment.