Skip to content

Commit

Permalink
Merge branch 'master' of github.com:PaulUithol/jquery-ui
Browse files Browse the repository at this point in the history 
Conflicts:
	tests/unit/dialog/dialog_options.js
	ui/jquery.ui.dialog.js
  • Loading branch information
@PaulUithol
PaulUithol committed Aug 2, 2011
2 parents 83d32c1 + dd73e09 commit b96d516
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit b96d516

Please sign in to comment.